update drawing interface

Author: Matt Sokoloff

examples/label_export/images.ipynb

@@ -38,7 +38,10 @@ def bytes_to_np(self, image_bytes: bytes) -> np.ndarray:
         Returns:
             numpy array representing the image
         """
-        return np.array(Image.open(BytesIO(image_bytes)))[:, :, :3]
+        arr = np.array(Image.open(BytesIO(image_bytes)))
+        if len(arr.shape) == 2:
+            arr = np.stack((arr,) * 3, axis=-1)
+        return arr[:, :, :3]
 
     def np_to_bytes(self, arr: np.ndarray) -> bytes:
         """

labelbox/data/annotation_types/data/raster.py

@@ -27,7 +27,7 @@ def raster(self,
                height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Optional[Union[int, Tuple[int,int,int]]] = None,
+               color: Optional[Union[int, Tuple[int, int, int]]] = None,
                thickness: Optional[int] = 1) -> np.ndarray:
         raise NotImplementedError("Subclass must override this")
 

labelbox/data/annotation_types/geometry/geometry.py

@@ -17,11 +17,11 @@ def geometry(self) -> geojson.MultiLineString:
             [[[point.x, point.y] for point in self.points]])
 
     def raster(self,
-              height: Optional[int] = None,
+               height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Union[int, Tuple[int,int,int]] = (255, 255, 255),
-               thickness: int = 5) -> np.ndarray:
+               color: Union[int, Tuple[int, int, int]] = (255, 255, 255),
+               thickness: int = 1) -> np.ndarray:
         """
         Draw the line onto a 3d mask
         Args:

labelbox/data/annotation_types/geometry/line.py

@@ -18,7 +18,7 @@ class Mask(Geometry):
 
     @property
     def geometry(self):
-        mask = self.raster(color = 1)
+        mask = self.raster(color=1)
         polygons = (
             shape(shp)
             for shp, val in shapes(mask, mask=None)
@@ -30,9 +30,8 @@ def raster(self,
                height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Optional[Union[int, Tuple[int,int,int]]] = None,
-               thickness = None
-               ) -> np.ndarray:
+               color: Optional[Union[int, Tuple[int, int, int]]] = None,
+               thickness=None) -> np.ndarray:
         """
         # TODO: Optionally use the color. a color of 1 will result in a binary canvas
 
@@ -65,13 +64,11 @@ def raster(self,
         if isinstance(color, (tuple, list)):
             dims = dims + [len(color)]
 
-        canvas = canvas if canvas is not None else np.zeros(tuple(dims), dtype=np.uint8)
+        canvas = canvas if canvas is not None else np.zeros(tuple(dims),
+                                                            dtype=np.uint8)
         canvas[mask.astype(np.bool)] = color
         return canvas
 
-
-
-
     def create_url(self, signer: Callable[[bytes], str]) -> str:
         """
         Update the segmentation mask to have a url.

labelbox/data/annotation_types/geometry/mask.py

@@ -19,9 +19,8 @@ def raster(self,
                height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Union[int, Tuple[int,int,int]] = (255, 255, 255),
-               thickness: int = 10
-               ) -> np.ndarray:
+               color: Union[int, Tuple[int, int, int]] = (255, 255, 255),
+               thickness: int = 10) -> np.ndarray:
         """
         Draw the point onto a 3d mask
         Args:
@@ -38,4 +37,4 @@ def raster(self,
         return cv2.circle(canvas, (int(self.x), int(self.y)),
                           radius=thickness,
                           color=color,
-                          thickness=-1)
+                          thickness=1)

labelbox/data/annotation_types/geometry/point.py

@@ -22,7 +22,7 @@ def raster(self,
                height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Union[int, Tuple[int,int,int]] = (255, 255, 255),
+               color: Union[int, Tuple[int, int, int]] = (255, 255, 255),
                thickness: int = -1) -> np.ndarray:
         """
         Draw the polygon onto a 3d mask

labelbox/data/annotation_types/geometry/polygon.py

@@ -32,7 +32,7 @@ def raster(self,
                height: Optional[int] = None,
                width: Optional[int] = None,
                canvas: Optional[np.ndarray] = None,
-               color: Union[int, Tuple[int,int,int]] = (255, 255, 255),
+               color: Union[int, Tuple[int, int, int]] = (255, 255, 255),
                thickness: int = -1) -> np.ndarray:
         """
         Draw the rectangle onto a 3d mask

labelbox/data/annotation_types/geometry/rectangle.py

@@ -128,12 +128,11 @@ def mask_miou(ground_truths: List[ObjectAnnotation],
     Returns:
         float representing the iou score for the masks
     """
-    prediction_np = np.max(
-        [pred.value.raster(color=1) for pred in predictions], axis=0)
-    ground_truth_np = np.max([
-        ground_truth.value.raster(color=1) for ground_truth in ground_truths
-    ],
-                             axis=0)
+    prediction_np = np.max([pred.value.raster(color=1) for pred in predictions],
+                           axis=0)
+    ground_truth_np = np.max(
+        [ground_truth.value.raster(color=1) for ground_truth in ground_truths],
+        axis=0)
     if prediction_np.shape != ground_truth_np.shape:
         raise ValueError(
             "Prediction and mask must have the same shape."