ndjson conversion passing tests

Author: Matt Sokoloff

labelbox/data/annotation_types/annotation.py

@@ -1,6 +1,6 @@
-from labelbox.data.annotation_types.classification.classification import Dropdown, Text, CheckList, Radio
 from typing import List, Union, Dict, Any
 
+from labelbox.data.annotation_types.classification.classification import Dropdown, Text, CheckList, Radio
 from labelbox.data.annotation_types.reference import FeatureSchemaRef
 from labelbox.data.annotation_types.ner import TextEntity
 from labelbox.data.annotation_types.geometry import Geometry
@@ -16,7 +16,7 @@ class ObjectAnnotation(BaseAnnotation):
 
 
 class ClassificationAnnotation(BaseAnnotation):
-    value: Union[Dropdown, Text, CheckList, Radio]
+    value: Union[Text, CheckList, Radio, Dropdown]
 
 
 ClassificationAnnotation.update_forward_refs()

labelbox/data/annotation_types/collection.py

@@ -1,14 +1,11 @@
-from labelbox.orm.model import Entity
-from labelbox.data.annotation_types.classification.classification import Text, Radio, CheckList, Dropdown
-from typing import Dict, Generator, Iterable, List, Any, Union
-from pydantic import BaseModel
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from typing import Iterable, List, Any
 from uuid import uuid4
 
+from pydantic import BaseModel
+
 from labelbox.data.annotation_types.label import Label
-from labelbox.schema.ontology import OntologyBuilder, Tool, Classification
-from labelbox.data.annotation_types.geometry import Rectangle, Polygon, Point, Mask, Line
-from labelbox.data.annotation_types.data.raster import RasterData
+from labelbox.orm.model import Entity
 
 
 class LabelCollection(BaseModel):

labelbox/data/annotation_types/data/raster.py

@@ -70,9 +70,10 @@ def validate_args(cls, values):
         im_bytes = values.get("im_bytes")
         url = values.get("url")
         arr = values.get("arr")
-        if file_path == im_bytes == url == None and arr is None:
+        uid = values.get('uid')
+        if uid == file_path == im_bytes == url == None and arr is None:
             raise ValidationError(
-                "One of `file_path`, `im_bytes`, `url`, or `arr` required.")
+                "One of `file_path`, `im_bytes`, `url`, `uid` or `arr` required.")
         if arr is not None:
             if arr.dtype != np.uint8:
                 raise ValidationError(

labelbox/data/annotation_types/data/text.py

@@ -45,11 +45,12 @@ def create_url(self, signer: Callable[[bytes], str]) -> None:
     @root_validator
     def validate_date(cls, values):
         file_path = values.get("file_path")
-        im_bytes = values.get("text")
+        text = values.get("text")
         url = values.get("url")
-        if file_path == im_bytes == url == None:
+        uid = values.get('uid')
+        if uid == file_path == text == url == None:
             raise ValidationError(
-                "One of `file_path`, `im_bytes`, or `url` required.")
+                "One of `file_path`, `text`, `uid`, or `url` required.")
         return values
 
     class config:

labelbox/data/annotation_types/data/video.py

@@ -99,11 +99,13 @@ def frames_to_video(self,
     @root_validator
     def validate_data(cls, values):
         file_path = values.get("file_path")
-        im_bytes = values.get("url")
-        url = values.get("frames")
-        if file_path == im_bytes == url == None:
+        url = values.get("url")
+        frames = values.get("frames")
+        uid = values.get("uid")
+
+        if uid == file_path == frames == url == None:
             raise ValidationError(
-                "One of `file_path`, `frames`, or `url` required.")
+                "One of `file_path`, `frames`, `uid`, or `url` required.")
         return values
 
     class Config:

labelbox/data/annotation_types/geometry/rectangle.py

@@ -27,3 +27,5 @@ def raster(self, height: int, width: int, color: int = 255) -> np.ndarray:
         canvas = np.zeros((height, width), dtype=np.uint8)
         pts = np.array(self.geometry['coordinates']).astype(np.int32)
         return cv2.fillPoly(canvas, pts=pts, color=color)
+
+    # TODO: Validate the start points are less than the end points

labelbox/data/annotation_types/label.py

@@ -1,20 +1,18 @@
-from labelbox.data.annotation_types.ner import TextEntity
-from labelbox.data.annotation_types.geometry import Geometry
-from labelbox.data.annotation_types.classification.classification import ClassificationAnswer, Radio, Text
-from labelbox.data.annotation_types.geometry.mask import Mask
-from typing import Type, Union, List, Dict, Any
+from typing import Union, List, Dict, Any
+
+from pydantic import BaseModel
 
 from labelbox.schema.ontology import Classification as OClassification, Option
+from labelbox.data.annotation_types.classification.classification import ClassificationAnswer
 from labelbox.data.annotation_types.annotation import AnnotationType, ClassificationAnnotation, ObjectAnnotation, VideoAnnotationType
 from labelbox.data.annotation_types.data.raster import RasterData
 from labelbox.data.annotation_types.data.text import TextData
 from labelbox.data.annotation_types.data.video import VideoData
 from labelbox.data.annotation_types.metrics import Metric
-from pydantic import BaseModel
+from labelbox.data.annotation_types.geometry.mask import Mask
 
 
 class Label(BaseModel):
-    # TODO: This sounds too much like the other label we need to rename this...
     data: Union[VideoData, RasterData, TextData]
     annotations: List[Union[AnnotationType, VideoAnnotationType, Metric]] = []
     extra: Dict[str, Any] = {}

labelbox/data/annotation_types/metrics.py

@@ -1,5 +1,3 @@
-import uuid
-
 from pydantic import BaseModel
 
 

labelbox/data/annotation_types/reference.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from pydantic import BaseModel, root_validator, ValidationError
+from pydantic import BaseModel
 
 
 class DataRowRef(BaseModel):
@@ -8,5 +8,9 @@ class DataRowRef(BaseModel):
 
 
 class FeatureSchemaRef(BaseModel):
-    display_name: str
+    display_name: Optional[str] = None
     schema_id: Optional[str] = None
+
+    # TODO: Validate that one of these is set..
+
+

labelbox/data/serialization/labelbox_v1/classifications.py

@@ -1,10 +1,8 @@
-from labelbox.data.annotation_types.classification.classification import Dropdown
-from labelbox.data.annotation_types.annotation import AnnotationType, ClassificationAnnotation
 from typing import List, Union
-from pydantic.main import BaseModel
 
-from pydantic.schema import schema
-from pydantic.typing import display_as_type
+from pydantic.main import BaseModel
+from labelbox.data.annotation_types.classification.classification import Dropdown
+from labelbox.data.annotation_types.annotation import AnnotationType, ClassificationAnnotation
 
 from labelbox.data.serialization.labelbox_v1.feature import LBV1Feature
 from labelbox.data.annotation_types.classification import Text, Radio, CheckList, ClassificationAnswer
@@ -13,7 +11,6 @@
 class LBV1ClassificationAnswer(LBV1Feature):
     ...
 
-
 class LBV1Radio(LBV1Feature):
     answer: LBV1ClassificationAnswer