denkproto 1.0.55__py3-none-any.whl → 1.0.57__py3-none-any.whl

denkproto/__about__.py

@@ -1 +1 @@
-__version__ = "1.0.55"
+__version__ = "1.0.57"

denkproto/json/ocr_markup.py

@@ -15,6 +15,11 @@ def to_float(x: Any) -> float:
     return x
 
 
+def from_int(x: Any) -> int:
+    assert isinstance(x, int) and not isinstance(x, bool)
+    return x
+
+
 def from_list(f: Callable[[Any], T], x: Any) -> List[T]:
     assert isinstance(x, list)
     return [f(y) for y in x]
@@ -44,11 +49,6 @@ def from_str(x: Any) -> str:
     return x
 
 
-def from_int(x: Any) -> int:
-    assert isinstance(x, int) and not isinstance(x, bool)
-    return x
-
-
 class BoundingBox:
     bottom_right_x: float
     bottom_right_y: float
@@ -101,29 +101,64 @@ class Point:
         return result
 
 
-class Polygon:
+class OcrMarkupSchema:
+    """A single closed loop (ring) of a polygon, defining either an outer boundary or a hole."""
+
+    hierarchy: int
+    """Nesting level: 0=outer, 1=hole in level 0, 2=poly in level 1 hole, etc. Even levels are
+    filled areas, odd levels are holes.
+    """
     points: List[Point]
+    """Vertices of the ring."""
 
-    def __init__(self, points: List[Point]) -> None:
+    def __init__(self, hierarchy: int, points: List[Point]) -> None:
+        self.hierarchy = hierarchy
         self.points = points
 
     @staticmethod
-    def from_dict(obj: Any) -> 'Polygon':
+    def from_dict(obj: Any) -> 'OcrMarkupSchema':
         assert isinstance(obj, dict)
+        hierarchy = from_int(obj.get("hierarchy"))
         points = from_list(Point.from_dict, obj.get("points"))
-        return Polygon(points)
+        return OcrMarkupSchema(hierarchy, points)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        result["hierarchy"] = from_int(self.hierarchy)
         result["points"] = from_list(lambda x: to_class(Point, x), self.points)
         return result
 
 
+class Polygon:
+    """A polygon defined by one or more rings, allowing for holes and nested structures."""
+
+    rings: List[OcrMarkupSchema]
+    """Array of polygon rings. The hierarchy field within each ring determines nesting and
+    fill/hole status.
+    """
+
+    def __init__(self, rings: List[OcrMarkupSchema]) -> None:
+        self.rings = rings
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'Polygon':
+        assert isinstance(obj, dict)
+        rings = from_list(OcrMarkupSchema.from_dict, obj.get("rings"))
+        return Polygon(rings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["rings"] = from_list(lambda x: to_class(OcrMarkupSchema, x), self.rings)
+        return result
+
+
 class Annotation:
     bounding_box: Optional[BoundingBox]
     id: UUID
     label_id: UUID
     polygon: Optional[Polygon]
+    """A polygon defined by one or more rings, allowing for holes and nested structures."""
+
     text: str
 
     def __init__(self, bounding_box: Optional[BoundingBox], id: UUID, label_id: UUID, polygon: Optional[Polygon], text: str) -> None:

denkproto/json/segmentation_markup.py

@@ -259,7 +259,7 @@ class PixelAnnotation:
         return result
 
 
-class PolygonAnnotationPoint:
+class RingPoint:
     x: float
     y: float
 
@@ -268,11 +268,11 @@ class PolygonAnnotationPoint:
         self.y = y
 
     @staticmethod
-    def from_dict(obj: Any) -> 'PolygonAnnotationPoint':
+    def from_dict(obj: Any) -> 'RingPoint':
         assert isinstance(obj, dict)
         x = from_float(obj.get("x"))
         y = from_float(obj.get("y"))
-        return PolygonAnnotationPoint(x, y)
+        return RingPoint(x, y)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -281,21 +281,54 @@ class PolygonAnnotationPoint:
         return result
 
 
-class PolygonAnnotation:
-    points: List[PolygonAnnotationPoint]
+class SegmentationMarkupSchema:
+    """A single closed loop (ring) of a polygon, defining either an outer boundary or a hole."""
+
+    hierarchy: int
+    """Nesting level: 0=outer, 1=hole in level 0, 2=poly in level 1 hole, etc. Even levels are
+    filled areas, odd levels are holes.
+    """
+    points: List[RingPoint]
+    """Vertices of the ring."""
 
-    def __init__(self, points: List[PolygonAnnotationPoint]) -> None:
+    def __init__(self, hierarchy: int, points: List[RingPoint]) -> None:
+        self.hierarchy = hierarchy
         self.points = points
 
+    @staticmethod
+    def from_dict(obj: Any) -> 'SegmentationMarkupSchema':
+        assert isinstance(obj, dict)
+        hierarchy = from_int(obj.get("hierarchy"))
+        points = from_list(RingPoint.from_dict, obj.get("points"))
+        return SegmentationMarkupSchema(hierarchy, points)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["hierarchy"] = from_int(self.hierarchy)
+        result["points"] = from_list(lambda x: to_class(RingPoint, x), self.points)
+        return result
+
+
+class PolygonAnnotation:
+    """A polygon defined by one or more rings, allowing for holes and nested structures."""
+
+    rings: List[SegmentationMarkupSchema]
+    """Array of polygon rings. The hierarchy field within each ring determines nesting and
+    fill/hole status.
+    """
+
+    def __init__(self, rings: List[SegmentationMarkupSchema]) -> None:
+        self.rings = rings
+
     @staticmethod
     def from_dict(obj: Any) -> 'PolygonAnnotation':
         assert isinstance(obj, dict)
-        points = from_list(PolygonAnnotationPoint.from_dict, obj.get("points"))
-        return PolygonAnnotation(points)
+        rings = from_list(SegmentationMarkupSchema.from_dict, obj.get("rings"))
+        return PolygonAnnotation(rings)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["points"] = from_list(lambda x: to_class(PolygonAnnotationPoint, x), self.points)
+        result["rings"] = from_list(lambda x: to_class(SegmentationMarkupSchema, x), self.rings)
         return result
 
 
@@ -458,44 +491,16 @@ class Annotation:
         return result
 
 
-class SegmentationMap:
-    blob_id: UUID
-    label_id: UUID
-    thumbnail: str
-
-    def __init__(self, blob_id: UUID, label_id: UUID, thumbnail: str) -> None:
-        self.blob_id = blob_id
-        self.label_id = label_id
-        self.thumbnail = thumbnail
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SegmentationMap':
-        assert isinstance(obj, dict)
-        blob_id = UUID(obj.get("blob_id"))
-        label_id = UUID(obj.get("label_id"))
-        thumbnail = from_str(obj.get("thumbnail"))
-        return SegmentationMap(blob_id, label_id, thumbnail)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["blob_id"] = str(self.blob_id)
-        result["label_id"] = str(self.label_id)
-        result["thumbnail"] = from_str(self.thumbnail)
-        return result
-
-
 class SegmentationMarkup:
     annotations: List[Annotation]
     average_object_widths: List[float]
     height: int
-    segmentation_maps: List[SegmentationMap]
     width: int
 
-    def __init__(self, annotations: List[Annotation], average_object_widths: List[float], height: int, segmentation_maps: List[SegmentationMap], width: int) -> None:
+    def __init__(self, annotations: List[Annotation], average_object_widths: List[float], height: int, width: int) -> None:
         self.annotations = annotations
         self.average_object_widths = average_object_widths
         self.height = height
-        self.segmentation_maps = segmentation_maps
         self.width = width
 
     @staticmethod
@@ -504,16 +509,14 @@ class SegmentationMarkup:
         annotations = from_list(Annotation.from_dict, obj.get("annotations"))
         average_object_widths = from_list(from_float, obj.get("average_object_widths"))
         height = from_int(obj.get("height"))
-        segmentation_maps = from_list(SegmentationMap.from_dict, obj.get("segmentation_maps"))
         width = from_int(obj.get("width"))
-        return SegmentationMarkup(annotations, average_object_widths, height, segmentation_maps, width)
+        return SegmentationMarkup(annotations, average_object_widths, height, width)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["annotations"] = from_list(lambda x: to_class(Annotation, x), self.annotations)
         result["average_object_widths"] = from_list(to_float, self.average_object_widths)
         result["height"] = from_int(self.height)
-        result["segmentation_maps"] = from_list(lambda x: to_class(SegmentationMap, x), self.segmentation_maps)
         result["width"] = from_int(self.width)
         return result
 

{denkproto-1.0.55.dist-info → denkproto-1.0.57.dist-info}/METADATA

@@ -1,5 +1,5 @@
 Metadata-Version: 2.3
 Name: denkproto
-Version: 1.0.55
+Version: 1.0.57
 Requires-Python: >=3.10
 Requires-Dist: protobuf>=3.20.3

{denkproto-1.0.55.dist-info → denkproto-1.0.57.dist-info}/RECORD

@@ -4,7 +4,7 @@ denkproto/DENKbuffer_pb2_grpc.py,sha256=-CPJPM4FOqwvwV8-f1iJlD18UD9juVIIHfdWUecu
 denkproto/ImageAnalysis_ProtobufMessages_pb2.py,sha256=iEY0j9ySGUThnqTdYD4uAVr9P3GiC5R02iK53zEOXUQ,21015
 denkproto/ImageAnalysis_ProtobufMessages_pb2.pyi,sha256=5LFtxrmYpJHizDDNGFTkL7-NQ_TkwqCSdq7vcv3lg-c,36243
 denkproto/ImageAnalysis_ProtobufMessages_pb2_grpc.py,sha256=l3agtDjgu4jay6P9TRnHhyhJ-7UdoII27ywhw3k84oo,911
-denkproto/__about__.py,sha256=2DUObEwLNvKLYm4zUMNwCtyPL1NYz7E03pnCYA8NfhE,23
+denkproto/__about__.py,sha256=3Clx6PzqZtLlqciDZfjzZTEc2KrmzE5ZGnFT2yQSkGE,23
 denkproto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 denkproto/denkcache_pb2.py,sha256=fvrIvDfK8ED_w0EfO0tIrLMsBh2T5yvVI-sNFCK7NEQ,6627
 denkproto/denkcache_pb2.pyi,sha256=qOzFOkddUapSJZz5d_mqcfHvWDAmM-70m_7FeM7n5fI,5595
@@ -25,8 +25,8 @@ denkproto/results_pb2_grpc.py,sha256=z-4qcDMjjuPRy7lDtECTtReByVEyz3fjIPES9dMlO58
 denkproto/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 denkproto/json/classification_markup.py,sha256=vTu0H7Cb3gU6UUUSg1vDTRlFUorZrjMbcp_yx6UssZA,2461
 denkproto/json/object_detection_markup.py,sha256=T0hcFPq8F_galjDjRC9dbcRVwCSOYtu2jt9wpEeHlQs,4904
-denkproto/json/ocr_markup.py,sha256=IaWbTCcJbLnS0e4u0PB1m8F-UpEwaQNTexVYKdXUPHI,5771
-denkproto/json/segmentation_markup.py,sha256=AQLZ-m7hq1hMPc9kLwhETaFPmTXfV3Omah5CIi-cJF0,19893
-denkproto-1.0.55.dist-info/METADATA,sha256=AFOKpt_vbco5lDLcaUQ-6974tk6VwqykEKJRz8sYQiU,110
-denkproto-1.0.55.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-denkproto-1.0.55.dist-info/RECORD,,
+denkproto/json/ocr_markup.py,sha256=KyOpth9evOekyhTJdZSnYyB9EIyoWbY33sqncb_jBgw,7069
+denkproto/json/segmentation_markup.py,sha256=EvniRksF2KaQolm6zZ6UKSiGwnqc8wR2sHB1iv05RTE,19911
+denkproto-1.0.57.dist-info/METADATA,sha256=dpbWmemfPSaywMgLKPK6clIfIH5hwMKsej4QdeMJ4mc,110
+denkproto-1.0.57.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+denkproto-1.0.57.dist-info/RECORD,,