Merge pull request #210 from Labelbox/ms/mea-annotation

mea-annotation

Author: msokoloff1

CHANGELOG.md

@@ -8,7 +8,6 @@
     - project.create_prediction_model()
     - project.create_label()
 
-
 # Version 2.7b1+mea (2021-06-27)
 ## Fix
 * No longer convert `ModelRun.created_by_id` to cuid on construction of a `ModelRun`.
@@ -19,7 +18,6 @@
 * Update `AnnotationGroup` to expect labelId to be a cuid instead of uuid.
 * Update `datarow_miou` to support masks with multiple classes in them.
 
-
 # Version 2.7.0 (2021-06-27)
 ## Added
 * Added `dataset.export_data_rows()` which returns all `DataRows` for a `Dataset`.

Makefile

@@ -6,7 +6,7 @@ test-staging: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="staging" \
 		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST) -svv
+		local/labelbox-python:test pytest $(PATH_TO_TEST) -svvx
 
 test-prod: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \

labelbox/data/annotation_types/data/raster.py

@@ -3,6 +3,7 @@
 
 import numpy as np
 import requests
+from google.api_core import retry
 from typing_extensions import Literal
 from pydantic import root_validator
 from PIL import Image
@@ -84,6 +85,7 @@ def data(self) -> np.ndarray:
     def set_fetch_fn(self, fn):
         object.__setattr__(self, 'fetch_remote', lambda: fn(self))
 
+    @retry.Retry(deadline=15.)
     def fetch_remote(self) -> bytes:
         """
         Method for accessing url.
@@ -95,6 +97,7 @@ def fetch_remote(self) -> bytes:
         response.raise_for_status()
         return response.content
 
+    @retry.Retry(deadline=15.)
     def create_url(self, signer: Callable[[bytes], str]) -> str:
         """
         Utility for creating a url from any of the other image representations.

labelbox/data/annotation_types/data/text.py

@@ -1,6 +1,7 @@
 from typing import Callable, Optional
 
 import requests
+from google.api_core import retry
 from pydantic import root_validator
 
 from .base_data import BaseData
@@ -39,6 +40,7 @@ def data(self) -> str:
     def set_fetch_fn(self, fn):
         object.__setattr__(self, 'fetch_remote', lambda: fn(self))
 
+    @retry.Retry(deadline=15.)
     def fetch_remote(self) -> str:
         """
         Method for accessing url.
@@ -50,6 +52,7 @@ def fetch_remote(self) -> str:
         response.raise_for_status()
         return response.text
 
+    @retry.Retry(deadline=15.)
     def create_url(self, signer: Callable[[bytes], str]) -> None:
         """
         Utility for creating a url from any of the other text references.

labelbox/data/annotation_types/data/video.py

@@ -7,6 +7,7 @@
 
 import cv2
 import numpy as np
+from google.api_core import retry
 from pydantic import root_validator
 
 from .base_data import BaseData
@@ -89,6 +90,7 @@ def __getitem__(self, idx: int) -> np.ndarray:
     def set_fetch_fn(self, fn):
         object.__setattr__(self, 'fetch_remote', lambda: fn(self))
 
+    @retry.Retry(deadline=15.)
     def fetch_remote(self, local_path) -> None:
         """
         Method for downloading data from self.url
@@ -101,6 +103,7 @@ def fetch_remote(self, local_path) -> None:
         """
         urllib.request.urlretrieve(self.url, local_path)
 
+    @retry.Retry(deadline=15.)
     def create_url(self, signer: Callable[[bytes], str]) -> None:
         """
         Utility for creating a url from any of the other video references.

labelbox/data/annotation_types/feature.py

@@ -19,6 +19,7 @@ class FeatureSchema(BaseModel):
 
     @root_validator
     def must_set_one(cls, values):
+
         if values['schema_id'] is None and values['name'] is None:
             raise ValueError(
                 "Must set either schema_id or name for all feature schemas")

labelbox/data/annotation_types/label.py

@@ -12,6 +12,7 @@
 from .metrics import Metric
 from .annotation import (ClassificationAnnotation, ObjectAnnotation,
                          VideoClassificationAnnotation, VideoObjectAnnotation)
+from labelbox.data.annotation_types import annotation
 
 
 class Label(BaseModel):
@@ -22,15 +23,14 @@ class Label(BaseModel):
     extra: Dict[str, Any] = {}
 
     def object_annotations(self) -> List[ObjectAnnotation]:
-        return [
-            annot for annot in self.annotations
-            if isinstance(annot, ObjectAnnotation)
-        ]
+        return self.get_annotations_by_type(ObjectAnnotation)
 
     def classification_annotations(self) -> List[ClassificationAnnotation]:
+        return self.get_annotations_by_type(ClassificationAnnotation)
+
+    def get_annotations_by_type(self, annotation_type):
         return [
-            annot for annot in self.annotations
-            if isinstance(annot, ClassificationAnnotation)
+            annot for annot in self.annotations if isinstance(annotation_type)
         ]
 
     def frame_annotations(