clean up

Author: Matt Sokoloff

labelbox/data/annotation_types/annotation.py

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

labelbox/data/annotation_types/classification/__init__.py

@@ -1 +1,2 @@
-from .classification import Dropdown, Text, CheckList, Radio, ClassificationAnswer
+from .classification import (Checklist, ClassificationAnswer, Dropdown, Radio,
+                             Text)

labelbox/data/annotation_types/classification/classification.py

@@ -1,8 +1,9 @@
 from typing import Any, Dict, List
 
-from labelbox.data.annotation_types.reference import FeatureSchemaRef
 from pydantic.main import BaseModel
 
+from ..feature import FeatureSchemaRef
+
 
 class ClassificationAnswer(FeatureSchemaRef):
     extra: Dict[str, Any] = {}
@@ -12,7 +13,7 @@ class Radio(BaseModel):
     answer: ClassificationAnswer
 
 
-class CheckList(BaseModel):
+class Checklist(BaseModel):
     answer: List[ClassificationAnswer]
 
 

labelbox/data/annotation_types/collection.py

@@ -3,12 +3,13 @@
 from typing import Callable, Generator, Iterable, Union
 from uuid import uuid4
 
-from labelbox.data.annotation_types.label import Label
-from labelbox.data.generator import PrefetchGenerator
-from labelbox.orm.model import Entity
-from labelbox.schema.ontology import OntologyBuilder
 from tqdm import tqdm
 
+from labelbox.schema.ontology import OntologyBuilder
+from labelbox.orm.model import Entity
+from ..generator import PrefetchGenerator
+from .label import Label
+
 logger = logging.getLogger(__name__)
 
 
@@ -74,7 +75,7 @@ def add_to_dataset(self,
         # The workaround is creating a new dataset
         """
         self._ensure_unique_external_ids()
-        self.add_urls_to_data(signer, max_concurrency=max_concurrency)
+        self.add_url_to_data(signer, max_concurrency=max_concurrency)
         upload_task = dataset.create_data_rows([{
             Entity.DataRow.row_data: label.data.url,
             Entity.DataRow.external_id: label.data.external_id
@@ -89,9 +90,7 @@ def add_to_dataset(self,
             label.data.uid = data_row_lookup[label.data.external_id]
         return self
 
-    def add_urls_to_masks(self,
-                          signer,
-                          max_concurrency=20) -> "LabelCollection":
+    def add_url_to_masks(self, signer, max_concurrency=20) -> "LabelCollection":
         """
         Creates a data row id for each data row that needs it. If the data row exists then it skips the row.
         TODO: Add error handling..
@@ -102,7 +101,7 @@ def add_urls_to_masks(self,
             ...
         return self
 
-    def add_urls_to_data(self, signer, max_concurrency=20) -> "LabelCollection":
+    def add_url_to_data(self, signer, max_concurrency=20) -> "LabelCollection":
         """
         TODO: Add error handling..
         """
@@ -152,18 +151,18 @@ def _assign_ids(label: Label):
         self._fns['assign_schema_ids'] = _assign_ids
         return self
 
-    def add_urls_to_data(self, signer: Callable[[bytes],
-                                                str]) -> "LabelGenerator":
+    def add_url_to_data(self, signer: Callable[[bytes],
+                                               str]) -> "LabelGenerator":
         """
         Updates masks to have `url` attribute
         Doesn't update masks that already have urls
         """
 
-        def _add_urls_to_data(label: Label):
+        def _add_url_to_data(label: Label):
             label.add_url_to_data(signer)
             return label
 
-        self._fns['_add_urls_to_data'] = _add_urls_to_data
+        self._fns['_add_url_to_data'] = _add_url_to_data
         return self
 
     def add_to_dataset(self, dataset,
@@ -176,18 +175,18 @@ def _add_to_dataset(label: Label):
         self._fns['assign_datarow_ids'] = _add_to_dataset
         return self
 
-    def add_urls_to_masks(self, signer: Callable[[bytes],
-                                                 str]) -> "LabelGenerator":
+    def add_url_to_masks(self, signer: Callable[[bytes],
+                                                str]) -> "LabelGenerator":
         """
         Updates masks to have `url` attribute
         Doesn't update masks that already have urls
         """
 
-        def _add_urls_to_masks(label: Label):
+        def _add_url_to_masks(label: Label):
             label.add_url_to_masks(signer)
             return label
 
-        self._fns['add_urls_to_masks'] = _add_urls_to_masks
+        self._fns['add_url_to_masks'] = _add_url_to_masks
         return self
 
     def __next__(self):

labelbox/data/annotation_types/data/__init__.py

@@ -0,0 +1,3 @@
+from .raster import RasterData
+from .text import TextData
+from .video import VideoData

labelbox/data/annotation_types/data/raster.py

@@ -1,16 +1,18 @@
+from typing import Callable, Optional
 from io import BytesIO
-from typing import Any, Callable, Dict, Optional
 
 import numpy as np
 import requests
-from labelbox.data.annotation_types.reference import DataRowRef
+from pydantic import root_validator
 from PIL import Image
-from pydantic import ValidationError, root_validator
 
+from .base_data import BaseData
 
-class RasterData(DataRowRef):
+
+class RasterData(BaseData):
     """
 
+
     """
     im_bytes: Optional[bytes] = None
     file_path: Optional[str] = None
@@ -49,7 +51,6 @@ def data(self) -> np.ndarray:
             raise ValueError("Must set either url, file_path or im_bytes")
 
     def create_url(self, signer: Callable[[bytes], str]) -> None:
-
         if self.url is not None:
             return self.url
         elif self.im_bytes is not None:

labelbox/data/annotation_types/data/text.py

@@ -1,11 +1,12 @@
 from typing import Callable, Optional
 
 import requests
-from labelbox.data.annotation_types.reference import DataRowRef
-from pydantic import ValidationError, root_validator
+from pydantic import root_validator
 
+from .base_data import BaseData
 
-class TextData(DataRowRef):
+
+class TextData(BaseData):
     file_path: Optional[str] = None
     text: Optional[str] = None
     url: Optional[str] = None

labelbox/data/annotation_types/data/video.py

@@ -1,18 +1,19 @@
 import logging
 import os
 import urllib.request
-from typing import Any, Callable, Dict, Generator, Optional, Tuple
+from typing import Callable, Dict, Generator, Optional, Tuple
 from uuid import uuid4
 
 import cv2
 import numpy as np
-from labelbox.data.annotation_types.reference import DataRowRef
-from pydantic import ValidationError, root_validator
+from pydantic import root_validator
+
+from .base_data import BaseData
 
 logger = logging.getLogger(__name__)
 
 
-class VideoData(DataRowRef):
+class VideoData(BaseData):
     file_path: Optional[str] = None
     url: Optional[str] = None
     frames: Optional[Dict[int, np.ndarray]] = None

labelbox/data/annotation_types/geometry/line.py

@@ -1,11 +1,11 @@
-from typing import List, Optional, Dict, Any
+from typing import List
 
 import geojson
 import numpy as np
 import cv2
 
-from labelbox.data.annotation_types.geometry.point import Point
-from labelbox.data.annotation_types.geometry.geometry import Geometry
+from .point import Point
+from .geometry import Geometry
 
 
 class Line(Geometry):

labelbox/data/annotation_types/geometry/mask.py

@@ -1,11 +1,12 @@
 from typing import Any, Dict, Tuple
 
 import numpy as np
-from labelbox.data.annotation_types.data.raster import RasterData
-from labelbox.data.annotation_types.geometry.geometry import Geometry
 from rasterio.features import shapes
 from shapely.geometry import MultiPolygon, shape
 
+from ..data.raster import RasterData
+from .geometry import Geometry
+
 
 class Mask(Geometry):
     # Raster data can be shared across multiple masks... or not