supervisely 6.73.211__tar.gz → 6.73.213__tar.gz

{supervisely-6.73.211/supervisely.egg-info → supervisely-6.73.213}/PKG-INFO

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

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/api/entity_annotation/figure_api.py

@@ -56,7 +56,7 @@ class FigureInfo(NamedTuple):
     tags: list
     meta: dict
     area: str
-    priority: int
+    priority: Optional[int] = None
 
     @property
     def bbox(self) -> Optional[Rectangle]:

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/cityscapes/cityscapes_helper.py

@@ -1,5 +1,6 @@
-from supervisely import Annotation, Label, PointLocation, Polygon, ProjectMeta, logger, ObjClass
+from supervisely import Annotation, Label, PointLocation, Polygon, ProjectMeta, logger, Rectangle
 from supervisely.io.json import load_json_file
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 COLOR_MAP_FILE_NAME = "class_to_id.json"
 
@@ -62,8 +63,11 @@ def convert_points(simple_points):
     return [PointLocation(int(p[1]), int(p[0])) for p in simple_points]
 
 
-def create_ann_from_file(ann: Annotation, ann_path: str, meta: ProjectMeta, renamed_classes: dict) -> Annotation:
+def create_ann_from_file(
+    ann: Annotation, ann_path: str, meta: ProjectMeta, renamed_classes: dict
+) -> Annotation:
     ann_data = load_json_file(ann_path)
+    labels = []
     for obj in ann_data["objects"]:
         class_name = obj["label"]
         class_name = renamed_classes.get(class_name, class_name)
@@ -83,5 +87,7 @@ def create_ann_from_file(ann: Annotation, ann_path: str, meta: ProjectMeta, rena
         interiors = [convert_points(interior) for interior in interiors]
         polygon = Polygon(convert_points(polygon), interiors)
         obj_class = meta.get_obj_class(class_name)
-        ann = ann.add_label(Label(polygon, obj_class))
+        labels.append(Label(polygon, obj_class))
+    labels = validate_image_bounds(labels, Rectangle.from_size(ann.img_size))
+    ann = ann.add_labels(labels)
     return ann

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/coco/coco_helper.py

@@ -7,7 +7,6 @@ from typing import List
 import cv2
 import numpy as np
 
-
 class HiddenCocoPrints:
     def __enter__(self):
         self._original_stdout = sys.stdout
@@ -37,10 +36,10 @@ from supervisely import (
 from supervisely.convert.image.image_converter import ImageConverter
 from supervisely.geometry.graph import KeypointsTemplate
 from supervisely.imaging.color import generate_rgb
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 conflict_classes = []
 
-
 # COCO Convert funcs
 def create_supervisely_annotation(
     item: ImageConverter.Item,
@@ -149,6 +148,7 @@ def create_supervisely_annotation(
                     Rectangle(y, x, y + h, x + w), obj_class_rectangle, binding_key=key
                 )
                 labels.append(rectangle)
+    labels = validate_image_bounds(labels, Rectangle.from_size(item.shape))
     return Annotation(item.shape, labels=labels, img_tags=imag_tags)
 
 

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/image_helper.py

@@ -4,9 +4,9 @@ from pathlib import Path
 import magic
 import numpy as np
 from PIL import Image
-from typing import Union
+from typing import Union, List
 
-from supervisely import logger
+from supervisely import Rectangle, Label, logger
 from supervisely.imaging.image import read, write
 from supervisely.io.fs import (
     get_file_ext,
@@ -98,4 +98,16 @@ def read_tiff_image(path: str) -> Union[np.ndarray, None]:
                     f"{name}: transposed shape from {tiff_shape} to {image.shape}"
                 )
 
-    return image
+    return image
+
+
+def validate_image_bounds(labels: List[Label], img_rect: Rectangle) -> List[Label]:
+    """
+    Check if labels are localed inside the image canvas, print a warning and skip them if not.
+    """
+    new_labels = [label for label in labels if img_rect.contains(label.geometry.to_bbox())]
+    if new_labels != labels:
+        logger.warning(
+            f"{len(labels) - len(new_labels)} annotation objects are out of image bounds. Skipping..."
+        )
+    return new_labels

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/label_me/label_me_helper.py

@@ -21,6 +21,7 @@ from supervisely.io.fs import file_exists
 from supervisely.io.json import dump_json_file, load_json_file
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.sly_logger import logger
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 labelme_shape_types_to_sly_map = {
     "polygon": Polygon,
@@ -221,6 +222,7 @@ def create_supervisely_annotation(
         label = convert_labelme_to_sly(shape, obj_class)
         if label is not None:
             labels.append(label)
+    labels = validate_image_bounds(labels, Rectangle.from_size(ann.img_size))
     ann = ann.add_labels(labels)
 
     return ann

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/label_studio/label_studio_helper.py

@@ -17,6 +17,7 @@ from supervisely.geometry.polygon import Polygon
 from supervisely.geometry.rectangle import Rectangle
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.sly_logger import logger
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 POSSIBLE_SHAPE_TYPES = ["polygonlabels", "rectanglelabels", "brushlabels"]
 POSSIBLE_TAGS_TYPES = ["choices"]
@@ -211,5 +212,6 @@ def create_supervisely_annotation(image_path: str, ann: Dict, meta: ProjectMeta)
     for labels in key_label_map.values():
         res_labels.extend(labels)
 
+    res_labels = validate_image_bounds(res_labels, Rectangle.from_size(sly_ann.img_size))
     sly_ann = sly_ann.clone(labels=res_labels, img_tags=img_tags)
     return sly_ann, meta

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/masks/images_with_masks_converter.py

@@ -2,13 +2,21 @@ import os
 from typing import Dict, Optional, Union
 
 import supervisely.convert.image.masks.image_with_masks_helper as helper
-from supervisely import Annotation, ProjectMeta, logger, ObjClass, Bitmap, ObjClassCollection
+from supervisely import (
+    Annotation,
+    ProjectMeta,
+    logger,
+    ObjClass,
+    Bitmap,
+    ObjClassCollection,
+    Rectangle,
+)
 from supervisely.convert.base_converter import AvailableImageConverters
 from supervisely.convert.image.image_converter import ImageConverter
 from supervisely.io.fs import file_exists, dirs_with_marker, dir_exists, get_file_name, list_files, dirs_filter, remove_junk_from_dir, get_file_ext
 from supervisely.io.json import load_json_file
 from supervisely.project.project_settings import LabelingInterface
-
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 class ImagesWithMasksConverter(ImageConverter):
     def __init__(
@@ -59,7 +67,7 @@ class ImagesWithMasksConverter(ImageConverter):
             return False
         self._meta = key_file_result
 
-        # possible_dss 
+        # possible_dss
         def _search_for_dss(dir_path):
             if any([d in os.listdir(dir_path) for d in helper.MASK_DIRS]):
                 return True
@@ -142,8 +150,11 @@ class ImagesWithMasksConverter(ImageConverter):
                 instance_labels = helper.read_instance_labels(
                     instance_masks_paths, meta.obj_classes, renamed_classes
                 )
+            all_labels = validate_image_bounds(
+                semantic_labels + instance_labels, Rectangle.from_size(item.shape)
+            )
 
-            ann = ann.add_labels(labels=semantic_labels + instance_labels)
+            ann = ann.add_labels(labels=all_labels)
 
             return ann
         except Exception as e:

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/pascal_voc/pascal_voc_helper.py

@@ -2,7 +2,7 @@ import os
 from typing import List, Tuple
 
 import numpy as np
-
+from supervisely.convert.image.image_helper import validate_image_bounds
 from supervisely import (
     Annotation,
     Label,
@@ -87,7 +87,6 @@ def read_colors(colors_file: str) -> Tuple[ObjClassCollection, dict]:
     color2class_name = {v: k for k, v in cls2col.items()}
     return obj_classes, color2class_name
 
-
 def get_ann(
     item,
     color2class_name: dict,
@@ -97,11 +96,13 @@ def get_ann(
 ) -> Annotation:
     segm_path, inst_path = item.segm_path, item.inst_path
     height, width = item.shape
-
+    img_rect = Rectangle.from_size(item.shape)
     ann = Annotation(img_size=(height, width))
 
     if item.ann_data is not None:
-        bbox_labels = xml_to_sly_labels(item.ann_data, meta, bbox_classes_map, renamed_classes)
+        bbox_labels = xml_to_sly_labels(
+            item.ann_data, meta, bbox_classes_map, img_rect, renamed_classes
+        )
         ann = ann.add_labels(bbox_labels)
 
     if segm_path is None:
@@ -136,15 +137,18 @@ def get_ann(
                     cls_name = renamed_classes[cls_name]
             curr_col2cls[color] = cls_name
 
+    labels = []
     for color, class_name in curr_col2cls.items():
         mask = np.all(colored_img == color, axis=2)  # exact match (3-channel img & rgb color)
         bitmap = Bitmap(data=mask)
         obj_class = ObjClass(name=class_name, geometry_type=Bitmap)
-
-        ann = ann.add_label(Label(bitmap, obj_class))
+        labels.append(Label(bitmap, obj_class))
         #  clear used pixels in mask to check missing colors, see below
         colored_img[mask] = (0, 0, 0)
 
+    labels = validate_image_bounds(labels, img_rect)
+    ann = ann.add_labels(labels)
+
     if np.sum(colored_img) > 0:
         logger.warn(
             f"Not all objects or classes are captured from source segmentation: {item.name}"
@@ -157,6 +161,7 @@ def xml_to_sly_labels(
     xml_path: str,
     meta: ProjectMeta,
     bbox_classes_map: dict,
+    img_rect: Rectangle,
     renamed_classes=None,
 ) -> List[Label]:
     import xml.etree.ElementTree as ET
@@ -180,6 +185,7 @@ def xml_to_sly_labels(
             bbox = Rectangle(*bbox_coords)
             label = Label(bbox, obj_cls)
             labels.append(label)
+    labels = validate_image_bounds(labels, img_rect)
 
     return labels
 

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/sly/fast_sly_image_converter.py

@@ -1,11 +1,21 @@
 import os
 
-from supervisely import Annotation, Api, ProjectMeta, batched, is_development, logger
+from supervisely import (
+    Annotation,
+    Api,
+    ProjectMeta,
+    Label,
+    Rectangle,
+    batched,
+    is_development,
+    logger,
+)
 from supervisely.convert.image.sly.sly_image_converter import SLYImageConverter
 import supervisely.convert.image.sly.sly_image_helper as helper
 from supervisely.convert.image.image_converter import ImageConverter
 from supervisely.io.fs import get_file_ext
 from supervisely.io.json import load_json_file
+from supervisely.convert.image.image_helper import validate_image_bounds
 
 
 class FastSlyImageConverter(SLYImageConverter, ImageConverter):
@@ -40,7 +50,6 @@ class FastSlyImageConverter(SLYImageConverter, ImageConverter):
         self._meta = meta
         return detected_ann_cnt > 0
 
-
     def to_supervisely(
         self,
         item: ImageConverter.Item,
@@ -58,12 +67,16 @@ class FastSlyImageConverter(SLYImageConverter, ImageConverter):
                 ann_json = ann_json["annotation"]
             if renamed_classes or renamed_tags:
                 ann_json = helper.rename_in_json(ann_json, renamed_classes, renamed_tags)
-            return Annotation.from_json(ann_json, meta)
+            img_size = list(ann_json["size"].values())
+            labels = validate_image_bounds(
+                [Label.from_json(obj, meta) for obj in ann_json["objects"]],
+                Rectangle.from_size(img_size),
+            )
+            return Annotation.from_json(ann_json, meta).clone(labels=labels)
         except Exception as e:
             logger.warn(f"Failed to convert annotation: {repr(e)}")
             return None
 
-
     def upload_dataset(
         self,
         api: Api,

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/image/sly/sly_image_converter.py

@@ -2,7 +2,17 @@ import os
 from typing import Dict, Optional
 
 import supervisely.convert.image.sly.sly_image_helper as sly_image_helper
-from supervisely import Annotation, Dataset, OpenMode, Project, ProjectMeta, logger
+from supervisely.convert.image.image_helper import validate_image_bounds
+from supervisely import (
+    Annotation,
+    Dataset,
+    OpenMode,
+    Project,
+    ProjectMeta,
+    Rectangle,
+    Label,
+    logger,
+)
 from supervisely._utils import generate_free_name
 from supervisely.api.api import Api
 from supervisely.convert.base_converter import AvailableImageConverters
@@ -134,7 +144,12 @@ class SLYImageConverter(ImageConverter):
                 ann_json = ann_json["annotation"]
             if renamed_classes or renamed_tags:
                 ann_json = sly_image_helper.rename_in_json(ann_json, renamed_classes, renamed_tags)
-            return Annotation.from_json(ann_json, meta)
+            img_size = list(ann_json["size"].values())
+            labels = validate_image_bounds(
+                [Label.from_json(obj, meta) for obj in ann_json["objects"]],
+                Rectangle.from_size(img_size),
+            )
+            return Annotation.from_json(ann_json, meta).clone(labels=labels)
         except Exception as e:
             logger.warn(f"Failed to convert annotation: {repr(e)}")
             return item.create_empty_annotation()

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/convert/video/video_converter.py

@@ -283,5 +283,5 @@ class VideoConverter(BaseConverter):
                     )
                 )
             upload_progress[0].set_current_value(monitor)
-        
+
         return lambda m: _print_progress(m, upload_progress)

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/nn/inference/inference.py

@@ -1064,7 +1064,9 @@ class Inference:
             tracker = None
 
         results = []
-        batch_size = state.get("batch_size", self.get_batch_size())
+        batch_size = state.get("batch_size", None)
+        if batch_size is None:
+            batch_size = self.get_batch_size()
         tracks_data = {}
         direction = 1 if direction == "forward" else -1
         for batch in batched(
@@ -1117,7 +1119,9 @@ class Inference:
         If "output_project_id" is None, write annotations to inference request object.
         """
         logger.debug("Inferring images...", extra={"state": state})
-        batch_size = state.get("batch_size", self.get_batch_size())
+        batch_size = state.get("batch_size", None)
+        if batch_size is None:
+            batch_size = self.get_batch_size()
         output_project_id = state.get("output_project_id", None)
         images_infos = api.image.get_info_by_id_batch(images_ids)
         images_infos_dict = {im_info.id: im_info for im_info in images_infos}
@@ -1385,7 +1389,9 @@ class Inference:
             project_info = api.project.get_info_by_id(state["projectId"])
         dataset_ids = state.get("dataset_ids", None)
         cache_project_on_model = state.get("cache_project_on_model", False)
-        batch_size = state.get("batch_size", self.get_batch_size())
+        batch_size = state.get("batch_size", None)
+        if batch_size is None:
+            batch_size = self.get_batch_size()
 
         datasets_infos = api.dataset.get_list(project_info.id, recursive=True)
         if dataset_ids is not None:
@@ -2008,7 +2014,9 @@ class Inference:
             )
             images_ids = request.state.state["images_ids"]
             # check batch size
-            batch_size = request.state.state.get("batch_size", self.get_batch_size())
+            batch_size = request.state.state.get("batch_size", None)
+            if batch_size is None:
+                batch_size = self.get_batch_size()
             if self.max_batch_size is not None and batch_size > self.max_batch_size:
                 response.status_code = status.HTTP_400_BAD_REQUEST
                 return {
@@ -2045,7 +2053,9 @@ class Inference:
         def inference_video_id(response: Response, request: Request):
             logger.debug(f"'inference_video_id' request in json format:{request.state.state}")
             # check batch size
-            batch_size = request.state.state.get("batch_size", self.get_batch_size())
+            batch_size = request.state.state.get("batch_size", None)
+            if batch_size is None:
+                batch_size = self.get_batch_size()
             if self.max_batch_size is not None and batch_size > self.max_batch_size:
                 response.status_code = status.HTTP_400_BAD_REQUEST
                 return {
@@ -2131,7 +2141,9 @@ class Inference:
         def inference_video_id_async(response: Response, request: Request):
             logger.debug(f"'inference_video_id_async' request in json format:{request.state.state}")
             # check batch size
-            batch_size = request.state.state.get("batch_size", self.get_batch_size())
+            batch_size = request.state.state.get("batch_size", None)
+            if batch_size is None:
+                batch_size = self.get_batch_size()
             if self.max_batch_size is not None and batch_size > self.max_batch_size:
                 response.status_code = status.HTTP_400_BAD_REQUEST
                 return {
@@ -2173,7 +2185,9 @@ class Inference:
             if project_info.type != str(ProjectType.IMAGES):
                 raise ValueError("Only images projects are supported.")
             # check batch size
-            batch_size = request.state.state.get("batch_size", self.get_batch_size())
+            batch_size = request.state.state.get("batch_size", None)
+            if batch_size is None:
+                batch_size = self.get_batch_size()
             if self.max_batch_size is not None and batch_size > self.max_batch_size:
                 response.status_code = status.HTTP_400_BAD_REQUEST
                 return {

{supervisely-6.73.211 → supervisely-6.73.213}/supervisely/project/data_version.py

@@ -399,11 +399,12 @@ class DataVersion(ModuleApiBase):
         updated_at = self.versions[str(version_id)]["updated_at"]
         backup_files = self.versions[str(version_id)]["path"]
 
-        if updated_at == self.project_info.updated_at:
-            logger.warning(
-                f"Project is already on version {version_num} with the same updated_at timestamp"
-            )
-            return
+        # turn off this check for now (treating this as a project clone operation)
+        # if updated_at == self.project_info.updated_at:
+        #     logger.warning(
+        #         f"Project is already on version {version_num} with the same updated_at timestamp"
+        #     )
+        #     return
 
         if backup_files is None:
             logger.warning(

{supervisely-6.73.211 → supervisely-6.73.213/supervisely.egg-info}/PKG-INFO

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