Revert tests

Author: Gabefire

libs/labelbox/src/labelbox/schema/data_row_metadata.py

@@ -1,4 +1,5 @@
 # type: ignore
+import warnings
 from copy import deepcopy
 from datetime import datetime
 from enum import Enum
@@ -14,7 +15,6 @@
     Type,
     Union,
     overload,
-    get_args,
 )
 
 from pydantic import (
@@ -28,7 +28,7 @@
 )
 from typing_extensions import Annotated
 
-from labelbox.schema.identifiable import GlobalKey, UniqueId, DataRowIdentifier
+from labelbox.schema.identifiable import GlobalKey, UniqueId
 from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
 from labelbox.schema.ontology import SchemaId
 from labelbox.utils import (
@@ -88,7 +88,7 @@ class DataRowMetadata(_CamelCaseMixin):
 
 
 class DeleteDataRowMetadata(_CamelCaseMixin):
-    data_row_id: Union[UniqueId, GlobalKey] = None
+    data_row_id: Union[str, UniqueId, GlobalKey] = None
     fields: List[SchemaId]
 
 
@@ -647,10 +647,21 @@ def bulk_delete(
         >>>    )
         >>> mdo.batch_delete([metadata])
 
+        >>> delete = DeleteDataRowMetadata(
+        >>>                 data_row_id="global-key",
+        >>>                 fields=[
+        >>>                        "schema-id-1",
+        >>>                        "schema-id-2"
+        >>>                        ...
+        >>>                    ]
+        >>>    )
+        >>> mdo.batch_delete([metadata])
+
 
         Args:
             deletes: Data row and schema ids to delete
-                For data row, we support UniqueId and GlobalKey.
+                For data row, we support UniqueId, str, and GlobalKey.
+                If you pass a str, we will assume it is a UniqueId
                 Do not pass a mix of data row ids and global keys in the same list
 
         Returns:
@@ -662,8 +673,17 @@ def bulk_delete(
         if not len(deletes):
             raise ValueError("The 'deletes' list cannot be empty.")
 
-        for delete in deletes:
-            if not isinstance(delete.data_row_id, get_args(DataRowIdentifier)):
+        for i, delete in enumerate(deletes):
+            if isinstance(delete.data_row_id, str):
+                deletes[i] = DeleteDataRowMetadata(
+                    data_row_id=UniqueId(delete.data_row_id),
+                    fields=delete.fields,
+                )
+            elif isinstance(delete.data_row_id, UniqueId):
+                continue
+            elif isinstance(delete.data_row_id, GlobalKey):
+                continue
+            else:
                 raise ValueError(
                     f"Invalid data row identifier type '{type(delete.data_row_id)}' for '{delete.data_row_id}'"
                 )

libs/labelbox/tests/integration/test_data_row_delete_metadata.py

@@ -121,9 +121,14 @@ def data_row_global_key(data_row):
     return GlobalKey(data_row.global_key)
 
 
+@pytest.fixture
+def data_row_id_as_str(data_row):
+    return data_row.uid
+
+
 @pytest.mark.parametrize(
     "data_row_for_delete",
-    ["data_row_unique_id", "data_row_global_key"],
+    ["data_row_id_as_str", "data_row_unique_id", "data_row_global_key"],
 )
 def test_bulk_delete_datarow_metadata(
     data_row_for_delete, data_row, mdo, request
@@ -149,7 +154,7 @@ def test_bulk_delete_datarow_metadata(
 
 @pytest.mark.parametrize(
     "data_row_for_delete",
-    ["data_row_unique_id", "data_row_global_key"],
+    ["data_row_id_as_str", "data_row_unique_id", "data_row_global_key"],
 )
 def test_bulk_partial_delete_datarow_metadata(
     data_row_for_delete, data_row, mdo, request
@@ -190,6 +195,21 @@ def data_row_unique_ids(big_dataset):
     return deletes
 
 
+@pytest.fixture
+def data_row_ids_as_str(big_dataset):
+    deletes = []
+    data_row_ids = [dr.uid for dr in big_dataset.data_rows()]
+
+    for data_row_id in data_row_ids:
+        deletes.append(
+            DeleteDataRowMetadata(
+                data_row_id=data_row_id,
+                fields=[SPLIT_SCHEMA_ID, CAPTURE_DT_SCHEMA_ID],
+            )
+        )
+    return deletes
+
+
 @pytest.fixture
 def data_row_global_keys(big_dataset):
     deletes = []
@@ -207,7 +227,7 @@ def data_row_global_keys(big_dataset):
 
 @pytest.mark.parametrize(
     "data_rows_for_delete",
-    ["data_row_unique_ids", "data_row_global_keys"],
+    ["data_row_ids_as_str", "data_row_unique_ids", "data_row_global_keys"],
 )
 def test_large_bulk_delete_datarow_metadata(
     data_rows_for_delete, big_dataset, mdo, request
@@ -247,7 +267,7 @@ def test_large_bulk_delete_datarow_metadata(
 
 @pytest.mark.parametrize(
     "data_row_for_delete",
-    ["data_row_unique_id", "data_row_global_key"],
+    ["data_row_id_as_str", "data_row_unique_id", "data_row_global_key"],
 )
 def test_bulk_delete_datarow_enum_metadata(
     data_row_for_delete,
@@ -284,7 +304,7 @@ def test_bulk_delete_datarow_enum_metadata(
 
 @pytest.mark.parametrize(
     "data_row_for_delete",
-    ["data_row_unique_id", "data_row_global_key"],
+    ["data_row_id_as_str", "data_row_unique_id", "data_row_global_key"],
 )
 def test_delete_non_existent_schema_id(
     data_row_for_delete, data_row, mdo, request

libs/labelbox/tests/integration/test_data_rows.py

@@ -1081,7 +1081,6 @@ def test_invalid_media_type(dataset, conversational_content):
         # TODO: What error kind should this be? It looks like for global key we are
         # using malformed query. But for invalid contents in FileUploads we use InvalidQueryError
         with pytest.raises(ResourceCreationError):
-            dataset.(
             dataset._create_data_rows_sync(
                 [{**conversational_content, "media_type": "IMAGE"}]
             )