supervisely 6.73.387__py3-none-any.whl → 6.73.388__py3-none-any.whl

supervisely/convert/image/pascal_voc/pascal_voc_converter.py

@@ -160,7 +160,6 @@ class PascalVOCConverter(ImageConverter):
             self._items.append(item)
         return detected_ann_cnt
 
-
     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")
@@ -170,11 +169,11 @@ class PascalVOCConverter(ImageConverter):
             inst_path = os.path.join(self._inst_dir, f"{item_name_noext}.png")
             if file_exists(inst_path):
                 item.inst_path = inst_path
-        
+
         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]
     ) -> Item:
         if ann_path is None:
             return item
@@ -186,7 +185,6 @@ class PascalVOCConverter(ImageConverter):
         item.ann_data = ann_path
         return item
 
-
     def to_supervisely(
         self,
         item: Item,
@@ -200,7 +198,12 @@ class PascalVOCConverter(ImageConverter):
         try:
             item.set_shape()
             return pascal_voc_helper.get_ann(
-                item, self.color2class_name, meta, self._bbox_classes_map, renamed_classes
+                item,
+                self.color2class_name,
+                meta,
+                self._bbox_classes_map,
+                renamed_classes,
+                renamed_tags,
             )
         except Exception as e:
             logger.warn(f"Failed to convert annotation: {repr(e)}")

supervisely/convert/image/pascal_voc/pascal_voc_helper.py

@@ -12,6 +12,8 @@ from supervisely.annotation.annotation import Annotation
 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.convert.image.image_helper import validate_image_bounds
 from supervisely.geometry.bitmap import Bitmap
 from supervisely.geometry.polygon import Polygon
@@ -33,6 +35,7 @@ VALID_IMG_EXT = {".jpe", ".jpeg", ".jpg"}
 TRAIN_TAG_NAME = "train"
 VAL_TAG_NAME = "val"
 TRAINVAL_TAG_NAME = "trainval"
+DEFAULT_OBJECT_FIELDS = {"name", "class", "bndbox"}
 
 default_classes_colors = {
     "neutral": (224, 224, 192),
@@ -118,6 +121,7 @@ def get_ann(
     meta: ProjectMeta,
     bbox_classes_map: dict,
     renamed_classes=None,
+    renamed_tags=None,
 ) -> Annotation:
     segm_path, inst_path = item.segm_path, item.inst_path
     height, width = item.shape
@@ -126,7 +130,7 @@ def get_ann(
 
     if item.ann_data is not None:
         bbox_labels = xml_to_sly_labels(
-            item.ann_data, meta, bbox_classes_map, img_rect, renamed_classes
+            item.ann_data, meta, bbox_classes_map, img_rect, renamed_classes, renamed_tags
         )
         ann = ann.add_labels(bbox_labels)
 
@@ -188,6 +192,7 @@ def xml_to_sly_labels(
     bbox_classes_map: dict,
     img_rect: Rectangle,
     renamed_classes=None,
+    renamed_tags=None,
 ) -> List[Label]:
     import xml.etree.ElementTree as ET
 
@@ -196,20 +201,40 @@ def xml_to_sly_labels(
         tree = ET.parse(in_file)
         root = tree.getroot()
 
-        for obj in root.iter("object"):
-            cls_name = obj.find("name").text
-            cls_name = bbox_classes_map.get(cls_name, cls_name)
-            if renamed_classes and cls_name in renamed_classes:
-                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.")
-                continue
-            xmlbox = obj.find("bndbox")
-            bbox_coords = [float(xmlbox.find(x).text) for x in ("ymin", "xmin", "ymax", "xmax")]
-            bbox = Rectangle(*bbox_coords)
-            label = Label(bbox, obj_cls)
-            labels.append(label)
+    for obj in root.iter("object"):
+        geometry = None
+        obj_cls = None
+        tags = []
+
+        for element in obj:
+            field_name, value = element.tag, element.text
+            if field_name in ["name", "class"]:
+                cls_name = bbox_classes_map.get(value, value)
+                if renamed_classes and cls_name in renamed_classes:
+                    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.")
+                    continue
+            elif field_name == "bndbox":
+                bbox_coords = [
+                    float(element.find(x).text) for x in ("ymin", "xmin", "ymax", "xmax")
+                ]
+                geometry = Rectangle(*bbox_coords)
+            elif field_name not in DEFAULT_OBJECT_FIELDS:
+                tag_name = field_name
+                if renamed_tags and tag_name in renamed_tags:
+                    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.")
+                    continue
+                if not isinstance(value, str):
+                    value = str(value)
+                tags.append(Tag(tag_meta, value))
+        if geometry is None or obj_cls is None:
+            continue
+        labels.append(Label(geometry, obj_cls, tags))
     labels = validate_image_bounds(labels, img_rect)
 
     return labels
@@ -227,32 +252,40 @@ def update_meta_from_xml(
         tree = ET.parse(in_file)
         root = tree.getroot()
 
-        for obj in root.iter("object"):
-            class_name = obj.find("name").text
-            original_class_name = class_name
-            obj_cls = meta.obj_classes.get(class_name)
-            if obj_cls is None:
-                obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
-                meta = meta.add_obj_class(obj_cls)
-                existing_cls_names.add(class_name)
-                continue
-            elif obj_cls.geometry_type == Rectangle:
-                continue
-            class_name = class_name + "_bbox"
-            obj_cls = meta.obj_classes.get(class_name)
-            if obj_cls is None:
-                obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
-                meta = meta.add_obj_class(obj_cls)
-                existing_cls_names.add(class_name)
-            elif obj_cls.geometry_type == Rectangle:
-                pass
-            else:
-                class_name = generate_free_name(
-                    existing_cls_names, class_name, extend_used_names=True
-                )
-                obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
-                meta = meta.add_obj_class(obj_cls)
-            bbox_classes_map[original_class_name] = class_name
+    for obj in root.iter("object"):
+        for element in obj:
+            field_name = element.tag
+            if field_name in ["name", "class"]:
+                class_name = element.text
+                original_class_name = class_name
+                obj_cls = meta.obj_classes.get(class_name)
+                if obj_cls is None:
+                    obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
+                    meta = meta.add_obj_class(obj_cls)
+                    existing_cls_names.add(class_name)
+                    continue
+                elif obj_cls.geometry_type == Rectangle:
+                    continue
+                class_name = class_name + "_bbox"
+                obj_cls = meta.obj_classes.get(class_name)
+                if obj_cls is None:
+                    obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
+                    meta = meta.add_obj_class(obj_cls)
+                    existing_cls_names.add(class_name)
+                elif obj_cls.geometry_type == Rectangle:
+                    pass
+                else:
+                    class_name = generate_free_name(
+                        existing_cls_names, class_name, extend_used_names=True
+                    )
+                    obj_cls = ObjClass(name=class_name, geometry_type=Rectangle)
+                    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)
 
     return meta
 

{supervisely-6.73.387.dist-info → supervisely-6.73.388.dist-info}/METADATA

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

{supervisely-6.73.387.dist-info → supervisely-6.73.388.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=h5Q3qW4riUCXPo5535wuKGurlLvPfKbWGML0RGnMxyg,7648
-supervisely/convert/image/pascal_voc/pascal_voc_helper.py,sha256=oM-HKUePUwB27aQjL-EvyeS7K-GX0X31rms2yOTTnGo,27872
+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/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
@@ -1103,9 +1103,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.387.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.387.dist-info/METADATA,sha256=6bZcP704iqdDpgH802O7uWemj3baQXCsDcmb5-hsDIE,35154
-supervisely-6.73.387.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.387.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.387.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.387.dist-info/RECORD,,
+supervisely-6.73.388.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.388.dist-info/METADATA,sha256=Jj-5_iGTZP0t8mfQSkiS3ADiyJg1YKqY0ZnVpmkarZQ,35154
+supervisely-6.73.388.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.388.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.388.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.388.dist-info/RECORD,,