supervisely 6.73.398__py3-none-any.whl → 6.73.399__py3-none-any.whl

supervisely/convert/image/pascal_voc/pascal_voc_converter.py

@@ -1,7 +1,15 @@
 import os
+from collections import defaultdict
 from typing import Dict, Optional, Set, Union
 
-from supervisely import Annotation, ProjectMeta, logger
+from supervisely import (
+    Annotation,
+    ProjectMeta,
+    TagApplicableTo,
+    TagMeta,
+    TagValueType,
+    logger,
+)
 from supervisely.convert.base_converter import AvailableImageConverters
 from supervisely.convert.image.image_converter import ImageConverter
 from supervisely.convert.image.pascal_voc import pascal_voc_helper
@@ -139,6 +147,7 @@ class PascalVOCConverter(ImageConverter):
 
     def _create_items(self, possible_pascal_voc_dir: str) -> int:
         existing_cls_names = set([cls.name for cls in self._meta.obj_classes])
+        tags_to_values = defaultdict(set)
         detected_ann_cnt = 0
 
         images_list = list_files_recursively(self._imgs_dir, valid_extensions=self.allowed_exts)
@@ -153,13 +162,42 @@ class PascalVOCConverter(ImageConverter):
             item_name_noext = get_file_name(item.name)
             item = self._scan_for_item_segm_paths(item, item_name_noext)
             ann_path = img_ann_map.get(item_name_noext) or img_ann_map.get(item.name)
-            item = self._scan_for_item_ann_path_and_update_meta(item, ann_path, existing_cls_names)
+            item = self._scan_for_item_ann_path_and_update_meta(
+                item, ann_path, existing_cls_names, tags_to_values
+            )
 
             if item.ann_data or item.segm_path:
                 detected_ann_cnt += 1
             self._items.append(item)
+        self._meta = self._update_meta_with_tags(tags_to_values)
         return detected_ann_cnt
 
+    def _update_meta_with_tags(self, tags_to_values: Dict[str, Set[str]]) -> ProjectMeta:
+        meta = self._meta
+        object_class_names = set(meta.obj_classes.keys())
+        for tag_name, values in tags_to_values.items():
+            tag_meta = meta.get_tag_meta(tag_name)
+            if tag_meta is not None:
+                continue
+            if tag_name in pascal_voc_helper.DEFAULT_SUBCLASSES:
+                if values.difference({"0", "1"}):
+                    logger.warning(
+                        f"Tag '{tag_name}' has non-binary values.", extra={"values": values}
+                    )
+                tag_meta = TagMeta(tag_name, TagValueType.NONE)
+            elif tag_name in object_class_names:
+                tag_meta = TagMeta(
+                    tag_name,
+                    TagValueType.ONEOF_STRING,
+                    possible_values=list(values),
+                    applicable_to=TagApplicableTo.OBJECTS_ONLY,
+                    applicable_classes=[tag_name],
+                )
+            else:
+                tag_meta = TagMeta(tag_name, TagValueType.ANY_STRING)
+            meta = meta.add_tag_meta(tag_meta)
+        return meta
+
     def _scan_for_item_segm_paths(self, item: Item, item_name_noext: str) -> Item:
         if self._segm_dir is not None:
             segm_path = os.path.join(self._segm_dir, f"{item_name_noext}.png")
@@ -173,14 +211,18 @@ class PascalVOCConverter(ImageConverter):
         return item
 
     def _scan_for_item_ann_path_and_update_meta(
-        self, item: Item, ann_path: Optional[str], existing_cls_names: Set[str]
+        self,
+        item: Item,
+        ann_path: Optional[str],
+        existing_cls_names: Set[str],
+        tags_to_values: Dict[str, Set[str]],
     ) -> Item:
         if ann_path is None:
             return item
         if not file_exists(ann_path):
             return item
         self._meta = pascal_voc_helper.update_meta_from_xml(
-            ann_path, self._meta, existing_cls_names, self._bbox_classes_map
+            ann_path, self._meta, existing_cls_names, self._bbox_classes_map, tags_to_values
         )
         item.ann_data = ann_path
         return item

supervisely/convert/image/pascal_voc/pascal_voc_helper.py

@@ -13,7 +13,7 @@ from supervisely.annotation.label import Label
 from supervisely.annotation.obj_class import ObjClass
 from supervisely.annotation.obj_class_collection import ObjClassCollection
 from supervisely.annotation.tag import Tag, TagValueType
-from supervisely.annotation.tag_meta import TagMeta
+from supervisely.annotation.tag_meta import TagApplicableTo, TagMeta
 from supervisely.convert.image.image_helper import validate_image_bounds
 from supervisely.geometry.bitmap import Bitmap
 from supervisely.geometry.polygon import Polygon
@@ -36,6 +36,8 @@ TRAIN_TAG_NAME = "train"
 VAL_TAG_NAME = "val"
 TRAINVAL_TAG_NAME = "trainval"
 DEFAULT_OBJECT_FIELDS = {"name", "class", "bndbox"}
+DEFAULT_SUBCLASSES = {"pose", "truncated", "difficult", "occluded", "obstacle", "out-of-scope"}
+
 
 default_classes_colors = {
     "neutral": (224, 224, 192),
@@ -179,7 +181,7 @@ def get_ann(
     ann = ann.add_labels(labels)
 
     if np.sum(colored_img) > 0:
-        logger.warn(
+        logger.warning(
             f"Not all objects or classes are captured from source segmentation: {item.name}"
         )
 
@@ -214,7 +216,7 @@ def xml_to_sly_labels(
                     cls_name = renamed_classes[cls_name]
                 obj_cls = meta.obj_classes.get(cls_name)
                 if obj_cls is None:
-                    logger.warn(f"Class {cls_name} is not found in meta. Skipping.")
+                    logger.warning(f"Class {cls_name} is not found in meta. Skipping.")
                     continue
             elif field_name == "bndbox":
                 bbox_coords = [
@@ -227,11 +229,25 @@ def xml_to_sly_labels(
                     tag_name = renamed_tags[tag_name]
                 tag_meta = meta.get_tag_meta(tag_name)
                 if tag_meta is None:
-                    logger.warn(f"Tag meta for '{field_name}' is not found in meta. Skipping.")
+                    logger.warning(f"Tag meta for '{field_name}' is not found in meta. Skipping.")
                     continue
-                if not isinstance(value, str):
-                    value = str(value)
-                tags.append(Tag(tag_meta, value))
+                if tag_meta.value_type == TagValueType.ANY_STRING:
+                    if not isinstance(value, str):
+                        value = str(value)
+                    tags.append(Tag(tag_meta, value))
+                elif tag_meta.value_type == TagValueType.NONE:
+                    if int(value) == 1:
+                        tags.append(Tag(tag_meta))
+                    else:
+                        logger.debug("Tag with value '0' not added to labels.")
+                elif tag_meta.value_type == TagValueType.ONEOF_STRING:
+                    if value not in tag_meta.possible_values:
+                        logger.warning(
+                            f"Value '{value}' for tag '{tag_name}' is not in possible values: {tag_meta.possible_values}. Skipping."
+                        )
+                        continue
+                    tags.append(Tag(tag_meta, value))
+
         if geometry is None or obj_cls is None:
             continue
         labels.append(Label(geometry, obj_cls, tags))
@@ -245,6 +261,7 @@ def update_meta_from_xml(
     meta: ProjectMeta,
     existing_cls_names: set,
     bbox_classes_map: dict,
+    tags_to_values: Dict[str, set],
 ) -> ProjectMeta:
     import xml.etree.ElementTree as ET
 
@@ -282,10 +299,8 @@ def update_meta_from_xml(
                     meta = meta.add_obj_class(obj_cls)
                 bbox_classes_map[original_class_name] = class_name
             elif field_name not in DEFAULT_OBJECT_FIELDS:
-                tag_meta = meta.get_tag_meta(field_name)
-                if tag_meta is None:
-                    tag_meta = TagMeta(field_name, TagValueType.ANY_STRING)
-                    meta = meta.add_tag_meta(tag_meta)
+                value = element.text
+                tags_to_values[field_name].add(value)
 
     return meta
 

{supervisely-6.73.398.dist-info → supervisely-6.73.399.dist-info}/METADATA

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

{supervisely-6.73.398.dist-info → supervisely-6.73.399.dist-info}/RECORD

@@ -610,8 +610,8 @@ supervisely/convert/image/multi_view/multi_view.py,sha256=V-6oFN6oDre7UhejfyDkGK
 supervisely/convert/image/multispectral/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/multispectral/multispectral_converter.py,sha256=T3etYVNI0AUUrQsQhxw_r85NthXrqhqmdZQfz8kUY0g,5194
 supervisely/convert/image/pascal_voc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/image/pascal_voc/pascal_voc_converter.py,sha256=zpn_s_WT1Z72WztXlPEJIBfO7-DbHCnjsOZFGOoYMCA,7729
-supervisely/convert/image/pascal_voc/pascal_voc_helper.py,sha256=vu6L2Gm1IU5aDPGibngVJvdje0ndS8NW-0WRhmr6vPE,29415
+supervisely/convert/image/pascal_voc/pascal_voc_converter.py,sha256=JwbkAT3W7aNHuxr9fas9PGrfDy4f5beyx6DWItIdVTw,9247
+supervisely/convert/image/pascal_voc/pascal_voc_helper.py,sha256=Ek2KeQjKhSDup8PBE53Pg82x7HHNjDkWNilmz7BHYj4,30199
 supervisely/convert/image/pdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/pdf/pdf_converter.py,sha256=LKvVng9jPp0cSIjYEjKLOb48wtdOdB7LXS2gjmOdZhE,2442
 supervisely/convert/image/pdf/pdf_helper.py,sha256=IDwLEvsVy8lu-KC1lXvSRkZZ9BCC6ylebnNEtLQU5L4,1288
@@ -1114,9 +1114,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.398.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.398.dist-info/METADATA,sha256=63LzbyDrvBYTjAZtYOo7Wp9ealkOXaqXMsjXZL4UtGw,35254
-supervisely-6.73.398.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.398.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.398.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.398.dist-info/RECORD,,
+supervisely-6.73.399.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.399.dist-info/METADATA,sha256=ZxlcTeH4-lJvPtaN7rpoQXr5o-qVhvyYrcfbFUiqm_M,35254
+supervisely-6.73.399.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.399.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.399.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.399.dist-info/RECORD,,