Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into examples

Author: Matt Sokoloff

labelbox/client.py

@@ -161,7 +161,7 @@ def check_errors(keywords, *path):
                     return error
             return None
 
-        if check_errors(["AUTHENTICATION_ERROR"], "extensions", "exception",
+        if check_errors(["AUTHENTICATION_ERROR"], "extensions",
                         "code") is not None:
             raise labelbox.exceptions.AuthenticationError("Invalid API key")
 
@@ -173,6 +173,7 @@ def check_errors(keywords, *path):
 
         validation_error = check_errors(["GRAPHQL_VALIDATION_FAILED"],
                                         "extensions", "code")
+
         if validation_error is not None:
             message = validation_error["message"]
             if message == "Query complexity limit exceeded":
@@ -193,8 +194,7 @@ def check_errors(keywords, *path):
             raise labelbox.exceptions.ApiLimitError(response_msg)
 
         resource_not_found_error = check_errors(["RESOURCE_NOT_FOUND"],
-                                                "extensions", "exception",
-                                                "code")
+                                                "extensions", "code")
         if resource_not_found_error is not None:
             # Return None and let the caller methods raise an exception
             # as they already know which resource type and ID was requested

labelbox/schema/ontology.py

@@ -42,8 +42,8 @@ def label(self):
     @classmethod
     def from_dict(cls, dictionary: Dict[str, Any]):
         return Option(value=dictionary["value"],
-                      schema_id=dictionary.get("schemaNodeId", []),
-                      feature_schema_id=dictionary.get("featureSchemaId", []),
+                      schema_id=dictionary.get("schemaNodeId", None),
+                      feature_schema_id=dictionary.get("featureSchemaId", None),
                       options=[
                           Classification.from_dict(o)
                           for o in dictionary.get("options", [])
@@ -123,10 +123,10 @@ def from_dict(cls, dictionary: Dict[str, Any]):
         return Classification(
             class_type=Classification.Type(dictionary["type"]),
             instructions=dictionary["instructions"],
-            required=dictionary["required"],
+            required=dictionary.get("required", False),
             options=[Option.from_dict(o) for o in dictionary["options"]],
-            schema_id=dictionary.get("schemaNodeId", []),
-            feature_schema_id=dictionary.get("featureSchemaId", []))
+            schema_id=dictionary.get("schemaNodeId", None),
+            feature_schema_id=dictionary.get("featureSchemaId", None))
 
     def asdict(self) -> Dict[str, Any]:
         if self.class_type in Classification._REQUIRES_OPTIONS \
@@ -201,9 +201,9 @@ class Type(Enum):
     @classmethod
     def from_dict(cls, dictionary: Dict[str, Any]):
         return Tool(name=dictionary['name'],
-                    schema_id=dictionary.get("schemaNodeId", []),
-                    feature_schema_id=dictionary.get("featureSchemaId", []),
-                    required=dictionary["required"],
+                    schema_id=dictionary.get("schemaNodeId", None),
+                    feature_schema_id=dictionary.get("featureSchemaId", None),
+                    required=dictionary.get("required", False),
                     tool=Tool.Type(dictionary["tool"]),
                     classifications=[
                         Classification.from_dict(c)