Merge pull request #1016 from Labelbox/kopreschko/AL-5309

Fix error message when end point coords are smaller than start point coords

Author: kopreschko

labelbox/data/serialization/ndjson/objects.py

@@ -198,10 +198,10 @@ def from_common(cls,
                     extra: Dict[str, Any],
                     data: Union[ImageData, TextData],
                     confidence: Optional[float] = None) -> "NDRectangle":
-        return cls(bbox=Bbox(top=rectangle.start.y,
-                             left=rectangle.start.x,
-                             height=rectangle.end.y - rectangle.start.y,
-                             width=rectangle.end.x - rectangle.start.x),
+        return cls(bbox=Bbox(top=min(rectangle.start.y, rectangle.end.y),
+                             left=min(rectangle.start.x, rectangle.end.x),
+                             height=abs(rectangle.end.y - rectangle.start.y),
+                             width=abs(rectangle.end.x - rectangle.start.x)),
                    data_row=DataRow(id=data.uid, global_key=data.global_key),
                    name=name,
                    schema_id=feature_schema_id,
@@ -230,10 +230,10 @@ def to_common(self, name: str, feature_schema_id: Cuid,
     @classmethod
     def from_common(cls, frame: int, rectangle: Rectangle):
         return cls(frame=frame,
-                   bbox=Bbox(top=rectangle.start.y,
-                             left=rectangle.start.x,
-                             height=rectangle.end.y - rectangle.start.y,
-                             width=rectangle.end.x - rectangle.start.x))
+                   bbox=Bbox(top=min(rectangle.start.y, rectangle.end.y),
+                             left=min(rectangle.start.x, rectangle.end.x),
+                             height=abs(rectangle.end.y - rectangle.start.y),
+                             width=abs(rectangle.end.x - rectangle.start.x)))
 
 
 class NDSegment(BaseModel):

tests/data/assets/ndjson/rectangle_import.json

@@ -0,0 +1,16 @@
+[
+    {
+      "dataRow": {
+        "id": "ckrb1sf1i1g7i0ybcdc6oc8ct"
+      },
+      "name": "bbox",
+      "uuid": "c1be3a57-597e-48cb-8d8d-a852665f9e72",
+      "classifications": [],
+      "bbox": {
+        "top": 28.0,
+        "left": 38.0,
+        "height": 41.0,
+        "width": 43.0
+      }
+    }
+  ]

tests/data/serialization/ndjson/test_rectangle.py

@@ -0,0 +1,87 @@
+import json
+import labelbox.types as lb_types
+from labelbox.data.serialization.ndjson.converter import NDJsonConverter
+
+DATAROW_ID = "ckrb1sf1i1g7i0ybcdc6oc8ct"
+
+
+def test_rectangle():
+    with open('tests/data/assets/ndjson/rectangle_import.json', 'r') as file:
+        data = json.load(file)
+    res = list(NDJsonConverter.deserialize(data))
+    res = list(NDJsonConverter.serialize(res))
+    assert res == data
+
+
+def test_rectangle_inverted_start_end_points():
+    with open('tests/data/assets/ndjson/rectangle_import.json', 'r') as file:
+        data = json.load(file)
+
+    bbox = lb_types.ObjectAnnotation(
+        name="bbox",
+        value=lb_types.Rectangle(
+            start=lb_types.Point(x=81, y=69),
+            end=lb_types.Point(x=38, y=28),
+        ),
+        extra={"uuid": "c1be3a57-597e-48cb-8d8d-a852665f9e72"})
+
+    label = lb_types.Label(data=lb_types.ImageData(uid=DATAROW_ID),
+                           annotations=[bbox])
+
+    res = list(NDJsonConverter.serialize([label]))
+    assert res == data
+
+    expected_bbox = lb_types.ObjectAnnotation(
+        name="bbox",
+        value=lb_types.Rectangle(
+            start=lb_types.Point(x=38, y=28),
+            end=lb_types.Point(x=81, y=69),
+        ),
+        extra={
+            "uuid": "c1be3a57-597e-48cb-8d8d-a852665f9e72",
+            "page": None,
+            "unit": None
+        })
+
+    label = lb_types.Label(data=lb_types.ImageData(uid=DATAROW_ID),
+                           annotations=[expected_bbox])
+
+    res = list(NDJsonConverter.deserialize(res))
+    assert res == [label]
+
+
+def test_rectangle_mixed_start_end_points():
+    with open('tests/data/assets/ndjson/rectangle_import.json', 'r') as file:
+        data = json.load(file)
+
+    bbox = lb_types.ObjectAnnotation(
+        name="bbox",
+        value=lb_types.Rectangle(
+            start=lb_types.Point(x=81, y=28),
+            end=lb_types.Point(x=38, y=69),
+        ),
+        extra={"uuid": "c1be3a57-597e-48cb-8d8d-a852665f9e72"})
+
+    label = lb_types.Label(data=lb_types.ImageData(uid=DATAROW_ID),
+                           annotations=[bbox])
+
+    res = list(NDJsonConverter.serialize([label]))
+    assert res == data
+
+    bbox = lb_types.ObjectAnnotation(
+        name="bbox",
+        value=lb_types.Rectangle(
+            start=lb_types.Point(x=38, y=28),
+            end=lb_types.Point(x=81, y=69),
+        ),
+        extra={
+            "uuid": "c1be3a57-597e-48cb-8d8d-a852665f9e72",
+            "page": None,
+            "unit": None
+        })
+
+    label = lb_types.Label(data=lb_types.ImageData(uid=DATAROW_ID),
+                           annotations=[bbox])
+
+    res = list(NDJsonConverter.deserialize(res))
+    assert res == [label]