supervisely 6.73.225__py3-none-any.whl → 6.73.226__py3-none-any.whl

supervisely/api/app_api.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import json
+import time
 from dataclasses import dataclass
 from time import sleep
 from typing import Any, Dict, List, NamedTuple, Optional, Union
@@ -536,10 +537,7 @@ class AppApi(TaskApi):
             self._enabled = True
             if is_development():
                 self._enabled = False
-                logger.warning(
-                    "Workflow is disabled in development mode. "
-                    "To enable it, use `api.app.workflow.enable()` right after Api initialization."
-                )
+            self.__last_warning_time = None
 
         def enable(self):
             """Enable the workflow functionality."""
@@ -574,10 +572,18 @@ class AppApi(TaskApi):
                         if min_instance_version is not None
                         else self._min_instance_version
                     )
-                    if (
-                        not check_workflow_compatibility(self._api, version_to_check)
-                        or not self._enabled
-                    ):
+                    if not self.is_enabled():
+                        if (
+                            self.__last_warning_time is None
+                            or time.monotonic() - self.__last_warning_time > 60
+                        ):
+                            self.__last_warning_time = time.monotonic()
+                            logger.warning(
+                                "Workflow is disabled in development mode. "
+                                "To enable it, use `api.app.workflow.enable()` right after Api initialization."
+                            )
+                        return
+                    if not check_workflow_compatibility(self._api, version_to_check):
                         logger.info(f"Workflow method `{func.__name__}` is disabled.")
                         return
                     return func(self, *args, **kwargs)

supervisely/nn/inference/inference.py

@@ -574,10 +574,15 @@ class Inference:
         for prediction in predictions:
             if (
                 not classes_whitelist in (None, "all")
+                and hasattr(prediction, "class_name")
                 and prediction.class_name not in classes_whitelist
             ):
                 continue
-            label = self._create_label(prediction)
+            if "classes_whitelist" in inspect.signature(self._create_label).parameters:
+                # pylint: disable=unexpected-keyword-arg
+                label = self._create_label(prediction, classes_whitelist)  # pylint: disable=too-many-function-args
+            else:
+                label = self._create_label(prediction)
             if label is None:
                 # for example empty mask
                 continue
@@ -2543,17 +2548,52 @@ def clean_up_cuda():
         logger.debug("Error in clean_up_cuda.", exc_info=True)
 
 
+def _fix_classes_names(meta: ProjectMeta, ann: Annotation):
+    def _replace_strip(s, chars: str, replacement: str = "_") -> str:
+        replace_pattern = f"^[{re.escape(chars)}]+|[{re.escape(chars)}]+$"
+        return re.sub(replace_pattern, replacement, s)
+
+    replaced_classes_in_meta = []
+    for obj_class in meta.obj_classes:
+        obj_class_name = _replace_strip(obj_class.name, " ", "")
+        if obj_class_name != obj_class.name:
+            new_obj_class = obj_class.clone(name=obj_class_name)
+            meta = meta.delete_obj_class(obj_class.name)
+            meta = meta.add_obj_class(new_obj_class)
+            replaced_classes_in_meta.append((obj_class.name, obj_class_name))
+    replaced_classes_in_ann = set()
+    new_labels = []
+    for label in ann.labels:
+        obj_class = label.obj_class
+        obj_class_name = _replace_strip(obj_class.name, " ", "")
+        if obj_class_name != obj_class.name:
+            new_obj_class = obj_class.clone(name=obj_class_name)
+            label = label.clone(obj_class=new_obj_class)
+            replaced_classes_in_ann.add((obj_class.name, obj_class_name))
+        new_labels.append(label)
+    ann = ann.clone(labels=new_labels)
+    return meta, ann, replaced_classes_in_meta, list(replaced_classes_in_ann)
+
+
 def update_meta_and_ann(meta: ProjectMeta, ann: Annotation):
     """Update project meta and annotation to match each other
     If obj class or tag meta from annotation conflicts with project meta
     add suffix to obj class or tag meta.
     Return tuple of updated project meta, annotation and boolean flag if meta was changed."""
-    obj_classes_suffixes = {"_nn"}
-    tag_meta_suffixes = {"_nn"}
+    obj_classes_suffixes = ["_nn"]
+    tag_meta_suffixes = ["_nn"]
     ann_obj_classes = {}
     ann_tag_metas = {}
     meta_changed = False
 
+    meta, ann, replaced_classes_in_meta, replaced_classes_in_ann = _fix_classes_names(meta, ann)
+    if replaced_classes_in_meta:
+        meta_changed = True
+        logger.warning(
+            "Some classes names were fixed in project meta",
+            extra={"replaced_classes": {old: new for old, new in replaced_classes_in_meta}},
+        )
+
     # get all obj classes and tag metas from annotation
     for label in ann.labels:
         ann_obj_classes[label.obj_class.name] = label.obj_class
@@ -2563,7 +2603,8 @@ def update_meta_and_ann(meta: ProjectMeta, ann: Annotation):
         ann_tag_metas[tag.meta.name] = tag.meta
 
     # check if obj classes are in project meta
-    # if not, add them with suffix
+    # if not, add them.
+    # if shape is different, add them with suffix
     changed_obj_classes = {}
     for ann_obj_class in ann_obj_classes.values():
         if meta.get_obj_class(ann_obj_class.name) is None:

supervisely/nn/inference/semantic_segmentation/semantic_segmentation.py

@@ -3,9 +3,11 @@ from typing import Any, Dict, List
 import numpy as np
 
 from supervisely.annotation.label import Label
+from supervisely.annotation.obj_class import ObjClass
 from supervisely.geometry.bitmap import Bitmap
 from supervisely.nn.inference.inference import Inference
 from supervisely.nn.prediction_dto import PredictionSegmentation
+from supervisely.project.project_meta import ProjectMeta
 from supervisely.sly_logger import logger
 
 
@@ -24,20 +26,48 @@ class SemanticSegmentation(Inference):
     def _get_obj_class_shape(self):
         return Bitmap
 
-    def _create_label(self, dto: PredictionSegmentation):
-        image_classes = np.unique(dto.mask)
+    def _find_bg_class_index(self, class_names: List[str]):
+        possible_bg_names = ["background", "bg", "unlabeled", "neutral", "__bg__"]
+        bg_class_index = None
+        for i, name in enumerate(class_names):
+            if name in possible_bg_names:
+                bg_class_index = i
+                break
+        return bg_class_index
+
+    def _add_default_bg_class(self, meta: ProjectMeta):
+        default_bg_class_name = "__bg__"
+        obj_class = meta.get_obj_class(default_bg_class_name)
+        if obj_class is None:
+            obj_class = ObjClass(default_bg_class_name, self._get_obj_class_shape())
+            meta = meta.add_obj_class(obj_class)
+        return meta, obj_class
+
+    def _get_or_create_bg_obj_class(self, classes):
+        bg_class_index = self._find_bg_class_index(classes)
+        if bg_class_index is None:
+            self._model_meta, bg_obj_class = self._add_default_bg_class(self.model_meta)
+        else:
+            bg_class_name = classes[bg_class_index]
+            bg_obj_class = self.model_meta.get_obj_class(bg_class_name)
+        return bg_obj_class
+
+    def _create_label(self, dto: PredictionSegmentation, classes_whitelist: List[str] = None):
+        classes = self.get_classes()
+
+        image_classes_indexes = np.unique(dto.mask)
         labels = []
-        for class_idx in image_classes:
+        for class_idx in image_classes_indexes:
             class_mask = dto.mask == class_idx
-            class_name = self.get_classes()[class_idx]
-            obj_class = self.model_meta.get_obj_class(class_name)
+            class_name = classes[class_idx]
+            if classes_whitelist not in (None, "all") and class_name not in classes_whitelist:
+                obj_class = self._get_or_create_bg_obj_class(classes)
+            else:
+                obj_class = self.model_meta.get_obj_class(class_name)
             if obj_class is None:
                 raise KeyError(
                     f"Class {class_name} not found in model classes {self.get_classes()}"
                 )
-            if not class_mask.any():  # skip empty masks
-                logger.debug(f"Mask of class {class_name} is empty and will be sklipped")
-                return None
             geometry = Bitmap(class_mask, extra_validation=False)
             label = Label(geometry, obj_class)
             labels.append(label)

{supervisely-6.73.225.dist-info → supervisely-6.73.226.dist-info}/METADATA

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

{supervisely-6.73.225.dist-info → supervisely-6.73.226.dist-info}/RECORD

@@ -23,7 +23,7 @@ supervisely/api/advanced_api.py,sha256=Nd5cCnHFWc3PSUrCtENxTGtDjS37_lCHXsgXvUI3T
 supervisely/api/agent_api.py,sha256=ShWAIlXcWXcyI9fqVuP5GZVCigCMJmjnvdGUfLspD6Y,8890
 supervisely/api/annotation_api.py,sha256=Eps-Jf10_SQFy7DjghUnyiM6DcVJBsamHDViRAXv2fg,51403
 supervisely/api/api.py,sha256=Jvc0nQqu6q4-1ey26AJiCcw96BzqP0ORBQqsoKO7gOI,60633
-supervisely/api/app_api.py,sha256=zX3Iy16RuGwtcLZfMs3YfUFc93S9AVGb3W_eINeMjOs,66729
+supervisely/api/app_api.py,sha256=hjoL24Nc1POlIqz5bkpMBij5D-cwCHvkznkaGpODyzA,67086
 supervisely/api/dataset_api.py,sha256=7iwAyz3pmzFG2i072gLdXjczfBGbyj-V_rRl7Tx-V30,37944
 supervisely/api/file_api.py,sha256=UQM5susk1DMgmEEZZq4tiMCKbglKYl8MqiZn1iPLqus,76821
 supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
@@ -817,7 +817,7 @@ supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8
 supervisely/nn/benchmark/visualization/widgets/table/table.py,sha256=YiCpt-mdINJnNBWsUTPkRR_9w09Ne2Y0n93DY8vsE8I,4090
 supervisely/nn/inference/__init__.py,sha256=mtEci4Puu-fRXDnGn8RP47o97rv3VTE0hjbYO34Zwqg,1622
 supervisely/nn/inference/cache.py,sha256=WylgHgPQRIoA_RDks8FyKgHqeZZ_YFoyddxkVvOX2YQ,25713
-supervisely/nn/inference/inference.py,sha256=pwTh6_EQ-sJNXTBD08eUMdOH8VoNF2uJUTr_P1-BuN0,114983
+supervisely/nn/inference/inference.py,sha256=jqhugSdwrKPyimiSxGvsJYLTjAyrxVmOl2FNql6f4aA,116982
 supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
 supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
 supervisely/nn/inference/gui/__init__.py,sha256=e3RKi93bI1r_0Dkvs_gaR1p_jkzkBMNjrcx-RVlm93k,88
@@ -846,7 +846,7 @@ supervisely/nn/inference/promptable_segmentation/promptable_segmentation.py,sha2
 supervisely/nn/inference/salient_object_segmentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/inference/salient_object_segmentation/salient_object_segmentation.py,sha256=fbTcI2GNXLD7JzFos05XqFDQCa57csaoYQFakYJRZh8,8136
 supervisely/nn/inference/semantic_segmentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/nn/inference/semantic_segmentation/semantic_segmentation.py,sha256=e4n523yGOGcZNIZI3bSHL0TgDjuttLf2r0piaakyGuA,2059
+supervisely/nn/inference/semantic_segmentation/semantic_segmentation.py,sha256=xpmViSYm1v_ZxlYyqiD_DiB7_LEynv9ZoU0t2QHEx8A,3370
 supervisely/nn/inference/tracking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/inference/tracking/bbox_tracking.py,sha256=URWGoYrCRN3yC4MyLx2_eZziZYwX6mPA8OLJqUOsAgA,15307
 supervisely/nn/inference/tracking/functional.py,sha256=LpVu2gvOOpr9D_uvwTPZey1wUCAhV-E20RPKmCSIrK4,1774
@@ -997,9 +997,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.225.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.225.dist-info/METADATA,sha256=oS0A-4lJ3n2xZcXc0n7SEXjpkQjY3e0WC5OMYDa4lRk,33150
-supervisely-6.73.225.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.225.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.225.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.225.dist-info/RECORD,,
+supervisely-6.73.226.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.226.dist-info/METADATA,sha256=MFZ1QnRu-QzhumIcVsb7aQvcfXiXxcbQ_dX9mrVG1tk,33150
+supervisely-6.73.226.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.226.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.226.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.226.dist-info/RECORD,,