Merge pull request #570 from Labelbox/kkim/add-metadata-exception-test

[AL-0] Modify test for data row with metadata creation

Author: kkim-labelbox

labelbox/client.py

@@ -37,7 +37,6 @@
 logger = logging.getLogger(__name__)
 
 _LABELBOX_API_KEY = "LABELBOX_API_KEY"
-_DATAROW_METADATA_CREATE_ERROR = "Failed to validate the metadata"
 
 
 class Client:
@@ -271,8 +270,6 @@ def get_error_status_code(error):
 
             if get_error_status_code(internal_server_error) == 400:
                 raise labelbox.exceptions.InvalidQueryError(message)
-            elif _DATAROW_METADATA_CREATE_ERROR in message:
-                raise labelbox.exceptions.ResourceCreationError(message)
             else:
                 raise labelbox.exceptions.InternalServerError(message)
 

tests/integration/test_client_errors.py

@@ -2,21 +2,11 @@
 import os
 import time
 import pytest
-from datetime import datetime
 
 from labelbox import Project, Dataset, User
-from labelbox.schema.data_row_metadata import DataRowMetadataField
 import labelbox.client
 import labelbox.exceptions
 
-SPLIT_SCHEMA_ID = "cko8sbczn0002h2dkdaxb5kal"
-TEST_SPLIT_ID = "cko8scbz70005h2dkastwhgqt"
-EMBEDDING_SCHEMA_ID = "ckpyije740000yxdk81pbgjdc"
-TEXT_SCHEMA_ID = "cko8s9r5v0001h2dk9elqdidh"
-CAPTURE_DT_SCHEMA_ID = "cko8sdzv70006h2dk8jg64zvb"
-IMAGE_EMBEDDING_SCHEMA_ID = "ckrzang79000008l6hb5s6za1"
-TEXT_EMBEDDING_SCHEMA_ID = "ckrzao09x000108l67vrcdnh3"
-
 
 def test_missing_api_key():
     key = os.environ.get(labelbox.client._LABELBOX_API_KEY, None)
@@ -142,28 +132,3 @@ def get(arg):
 
     # Sleep at the end of this test to allow other tests to execute.
     time.sleep(60)
-
-
-@pytest.mark.skip("Staging environment not returning correct exception")
-def test_resource_creation_error(dataset, image_url):
-
-    def make_metadata_fields():
-        embeddings = [0.0] * 128
-        msg = "A message"
-        time = datetime.utcnow()
-
-        fields = [
-            DataRowMetadataField(schema_id=SPLIT_SCHEMA_ID,
-                                 value=TEST_SPLIT_ID),
-            DataRowMetadataField(schema_id=CAPTURE_DT_SCHEMA_ID, value=time),
-            DataRowMetadataField(schema_id=TEXT_SCHEMA_ID, value=msg),
-            DataRowMetadataField(schema_id=EMBEDDING_SCHEMA_ID,
-                                 value=embeddings),
-            DataRowMetadataField(schema_id=EMBEDDING_SCHEMA_ID,
-                                 value=embeddings),
-        ]
-        return fields
-
-    with pytest.raises(labelbox.exceptions.ResourceCreationError) as excinfo:
-        dataset.create_data_row(row_data=image_url,
-                                custom_metadata=make_metadata_fields())

tests/integration/test_data_rows.py

@@ -8,6 +8,7 @@
 
 from labelbox import DataRow
 from labelbox.schema.data_row_metadata import DataRowMetadataField
+import labelbox.exceptions
 
 SPLIT_SCHEMA_ID = "cko8sbczn0002h2dkdaxb5kal"
 TEST_SPLIT_ID = "cko8scbz70005h2dkastwhgqt"
@@ -176,6 +177,30 @@ def test_data_row_single_creation_with_metadata(dataset, rand_gen, image_url):
         assert requests.get(data_row_2.row_data).content == data
 
 
+def test_data_row_single_creation_with_invalid_metadata(dataset, image_url):
+
+    def make_invalid_metadata_fields():
+        embeddings = [0.0] * 128
+        msg = "A message"
+        time = datetime.utcnow()
+
+        fields = [
+            DataRowMetadataField(schema_id=SPLIT_SCHEMA_ID,
+                                 value=TEST_SPLIT_ID),
+            DataRowMetadataField(schema_id=CAPTURE_DT_SCHEMA_ID, value=time),
+            DataRowMetadataField(schema_id=TEXT_SCHEMA_ID, value=msg),
+            DataRowMetadataField(schema_id=EMBEDDING_SCHEMA_ID,
+                                 value=embeddings),
+            DataRowMetadataField(schema_id=EMBEDDING_SCHEMA_ID,
+                                 value=embeddings),
+        ]
+        return fields
+
+    with pytest.raises(labelbox.exceptions.MalformedQueryException) as excinfo:
+        dataset.create_data_row(row_data=image_url,
+                                custom_metadata=make_invalid_metadata_fields())
+
+
 def test_data_row_update(dataset, rand_gen, image_url):
     external_id = rand_gen(str)
     data_row = dataset.create_data_row(row_data=image_url,