Merge pull request #120 from Labelbox/develop

2.5.0 Release

Author: msokoloff1

CHANGELOG.md

@@ -1,10 +1,18 @@
 # Changelog
 
-## In progress
+## Version 2.5.0 (2021-03-15)
 ### Fix
-* Custom queries with bad syntax now raise adequate exceptions (InvalidQuery)
-* Comparing a Labelbox object (e.g. Project) to None doesn't raise an exception
-* Adding `order_by` to `Project.labels` doesn't raise an exception
+* `Dataset.data_row_for_external_id` No longer throws `ResourceNotFoundError` when there are duplicates
+*  Improved doc strings
+
+### Added
+* OntologyBuilder for making project setup easier
+* Now supports `IMAGE_OVERLAY` metadata
+* Webhooks for review topics added
+* Upload project instructions with `Project.upsert_instructions`
+* User input validation 
+    * MAL validity is now checked client side for faster feedback
+    * type and value checks added in a few places
 
 ## Version 2.4.11 (2021-03-07)
 ### Fix

Dockerfile

@@ -1,8 +1,11 @@
 FROM python:3.7
 
-RUN pip install pytest
+RUN pip install pytest pytest-cases
 
-COPY . /usr/src/labelbox
 WORKDIR /usr/src/labelbox
+COPY requirements.txt /usr/src/labelbox
+RUN pip install -r requirements.txt
+COPY . /usr/src/labelbox
+
 
 RUN python setup.py install

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "2.4.11"
+__version__ = "2.5.0"
 
 from labelbox.client import Client
 from labelbox.schema.bulk_import_request import BulkImportRequest

labelbox/exceptions.py

@@ -104,3 +104,12 @@ class MalformedQueryException(Exception):
 class UuidError(LabelboxError):
     """ Raised when there are repeat Uuid's in bulk import request."""
     pass
+
+
+class InconsistentOntologyException(Exception):
+    pass
+
+
+class MALValidationError(LabelboxError):
+    """Raised when user input is invalid for MAL imports."""
+    ...

labelbox/schema/asset_metadata.py

@@ -1,3 +1,5 @@
+from enum import Enum
+
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field
 
@@ -9,9 +11,16 @@ class AssetMetadata(DbObject):
         meta_type (str): IMAGE, VIDEO, TEXT, or IMAGE_OVERLAY
         meta_value (str): URL to an external file or a string of text
     """
-    VIDEO = "VIDEO"
-    IMAGE = "IMAGE"
-    TEXT = "TEXT"
+
+    class MetaType(Enum):
+        VIDEO = "VIDEO"
+        IMAGE = "IMAGE"
+        TEXT = "TEXT"
+        IMAGE_OVERLAY = "IMAGE_OVERLAY"
+
+    # For backwards compatibility
+    for topic in MetaType:
+        vars()[topic.name] = topic.value
 
     meta_type = Field.String("meta_type")
     meta_value = Field.String("meta_value")