updates

Author: jtsodapop

labelbox/data/serialization/labelbox_v1/objects.py

@@ -5,6 +5,7 @@
     from typing_extensions import Literal
 
 from pydantic import BaseModel, validator, Field
+import numpy as np
 
 from .classification import LBV1Checklist, LBV1Classifications, LBV1Radio, LBV1Text, LBV1Dropdown
 from .feature import LBV1Feature
@@ -46,14 +47,25 @@ def validate_subclasses(cls, value, field):
         return value
 
 
-class _Coordinates(BaseModel):
-    """Union of the possible coordinate lists in tiled imagery exports"""
-    coordinates: Union[List[float], List[List[float]], List[List[List[float]]]]
+class TIPointCoordinate(BaseModel):
+    coordinates: List[float]
+
+
+class TILineCoordinate(BaseModel):
+    coordinates: List[List[float]]
+
+
+class TIPolygonCoordinate(BaseModel):
+    coordinates: List[List[List[float]]]
+
+
+class TIRectangleoordinate(BaseModel):
+    coordinates: List[List[List[float]]]
 
 
 class LBV1TIPoint(LBV1ObjectBase):
     object_type: Literal['point'] = Field(..., alias='type')
-    geometry: _Coordinates
+    geometry: TIPointCoordinate
 
     def to_common(self) -> Point:
         lng, lat = self.geometry.coordinates
@@ -62,7 +74,7 @@ def to_common(self) -> Point:
 
 class LBV1TILine(LBV1ObjectBase):
     object_type: Literal['polyline'] = Field(..., alias='type')
-    geometry: _Coordinates
+    geometry: TILineCoordinate
 
     def to_common(self) -> Line:
         return Line(points=[
@@ -72,7 +84,7 @@ def to_common(self) -> Line:
 
 class LBV1TIPolygon(LBV1ObjectBase):
     object_type: Literal['polygon'] = Field(..., alias='type')
-    geometry: _Coordinates
+    geometry: TIPolygonCoordinate
 
     def to_common(self) -> Polygon:
         for coord_list in self.geometry.coordinates:
@@ -82,12 +94,17 @@ def to_common(self) -> Polygon:
 
 class LBV1TIRectangle(LBV1ObjectBase):
     object_type: Literal['rectangle'] = Field(..., alias='type')
-    geometry: _Coordinates
+    geometry: TIRectangleoordinate
 
     def to_common(self) -> Rectangle:
-        coord_list = self.geometry.coordinates[0]
-        start = coord_list[0]
-        end = coord_list[2]
+        coord_list = np.array(self.geometry.coordinates[0])
+
+        min_x, max_x = np.min(coord_list[:, 0]), np.max(coord_list[:, 0])
+        min_y, max_y = np.min(coord_list[:, 1]), np.max(coord_list[:, 1])
+
+        start = [min_x, min_y]
+        end = [max_x, max_y]
+
         return Rectangle(start=Point(x=start[0], y=start[1]),
                          end=Point(x=end[0], y=end[1]))
 

tests/data/serialization/labelbox_v1/test_tiled_image.py

@@ -1,8 +1,13 @@
 import json
 
 import pytest
+from labelbox.data.annotation_types.geometry.polygon import Polygon
+from labelbox.data.annotation_types.geometry.line import Line
+from labelbox.data.annotation_types.geometry.point import Point
+from labelbox.data.annotation_types.geometry.rectangle import Rectangle
 
 from labelbox.data.serialization.labelbox_v1.converter import LBV1Converter
+from labelbox.schema.bulk_import_request import Bbox
 
 
 @pytest.mark.parametrize(
@@ -18,5 +23,23 @@ def test_image(file_path):
         collection_as_list = collection.as_list()
 
         assert len(collection_as_list) == 2
-        assert len(collection_as_list[0].annotations) == 6
-        assert len(collection_as_list[1].annotations) == 8
+
+        non_simple_annotations = collection_as_list[0].annotations
+        assert len(non_simple_annotations) == 6
+        expected_shapes = [Polygon, Point, Point, Point, Line, Rectangle]
+        for idx in range(len(non_simple_annotations)):
+            assert isinstance(non_simple_annotations[idx].value,
+                              expected_shapes[idx])
+        assert non_simple_annotations[-1].value.start.x == -99.36567524971268
+        assert non_simple_annotations[-1].value.start.y == 19.34717117508651
+        assert non_simple_annotations[-1].value.end.x == -99.3649886680726
+        assert non_simple_annotations[-1].value.end.y == 19.41999425190506
+
+        simple_annotations = collection_as_list[1].annotations
+        assert len(simple_annotations) == 8
+        expected_shapes = [
+            Polygon, Point, Point, Point, Point, Point, Line, Rectangle
+        ]
+        for idx in range(len(simple_annotations)):
+            assert isinstance(simple_annotations[idx].value,
+                              expected_shapes[idx])