removed rest of deprecated

Author: Gabefire

libs/labelbox/src/labelbox/schema/asset_attachment.py

@@ -7,15 +7,6 @@
 
 
 class AttachmentType(str, Enum):
-    @classmethod
-    def __missing__(cls, value: object):
-        if str(value) == "TEXT":
-            warnings.warn(
-                "The TEXT attachment type is deprecated. Use RAW_TEXT instead."
-            )
-            return cls.RAW_TEXT
-        return value
-
     VIDEO = "VIDEO"
     IMAGE = "IMAGE"
     IMAGE_OVERLAY = "IMAGE_OVERLAY"
@@ -30,7 +21,7 @@ class AssetAttachment(DbObject):
     """Asset attachment provides extra context about an asset while labeling.
 
     Attributes:
-        attachment_type (str): IMAGE, VIDEO, IMAGE_OVERLAY, HTML, RAW_TEXT, TEXT_URL, or PDF_URL. TEXT attachment type is deprecated.
+        attachment_type (str): IMAGE, VIDEO, IMAGE_OVERLAY, HTML, RAW_TEXT, TEXT_URL, or PDF_URL.
         attachment_value (str): URL to an external file or a string of text
         attachment_name (str): The name of the attachment
     """

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

@@ -1,5 +1,4 @@
 # type: ignore
-import warnings
 from copy import deepcopy
 from datetime import datetime
 from enum import Enum
@@ -673,29 +672,14 @@ def bulk_delete(
         if not len(deletes):
             raise ValueError("The 'deletes' list cannot be empty.")
 
-        passed_strings = False
-        for i, delete in enumerate(deletes):
-            if isinstance(delete.data_row_id, str):
-                passed_strings = True
-                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:
+        for delete in enumerate(deletes):
+            if not isinstance(delete.data_row_id, UniqueId) or not isinstance(
+                delete.data_row_id, GlobalKey
+            ):
                 raise ValueError(
                     f"Invalid data row identifier type '{type(delete.data_row_id)}' for '{delete.data_row_id}'"
                 )
 
-            if passed_strings:
-                warnings.warn(
-                    "Using string for data row id will be deprecated. Please use "
-                    "UniqueId instead."
-                )
-
         def _batch_delete(
             deletes: List[_DeleteBatchDataRowMetadata],
         ) -> List[DataRowMetadataBatchResponse]:

libs/labelbox/src/labelbox/schema/dataset.py

@@ -166,47 +166,13 @@ def create_data_row(self, items=None, **kwargs) -> "DataRow":
 
         return self.client.get_data_row(res[0]["id"])
 
-    def create_data_rows_sync(
-        self, items, file_upload_thread_count=FILE_UPLOAD_THREAD_COUNT
-    ) -> None:
-        """Synchronously bulk upload data rows.
-
-        Use this instead of `Dataset.create_data_rows` for smaller batches of data rows that need to be uploaded quickly.
-        Cannot use this for uploads containing more than 1000 data rows.
-        Each data row is also limited to 5 attachments.
-
-        Args:
-            items (iterable of (dict or str)):
-                See the docstring for `Dataset._create_descriptor_file` for more information.
-        Returns:
-            None. If the function doesn't raise an exception then the import was successful.
-
-        Raises:
-            ResourceCreationError: If the `items` parameter does not conform to
-                the specification in Dataset._create_descriptor_file or if the server did not accept the
-                DataRow creation request (unknown reason).
-            InvalidAttributeError: If there are fields in `items` not valid for
-                a DataRow.
-            ValueError: When the upload parameters are invalid
-        """
-        warnings.warn(
-            "This method is deprecated and will be "
-            "removed in a future release. Please use create_data_rows instead."
-        )
-
-        self._create_data_rows_sync(
-            items, file_upload_thread_count=file_upload_thread_count
-        )
-
-        return None  # Return None if no exception is raised
-
     def _create_data_rows_sync(
         self, items, file_upload_thread_count=FILE_UPLOAD_THREAD_COUNT
     ) -> "DataUpsertTask":
         max_data_rows_supported = 1000
         if len(items) > max_data_rows_supported:
             raise ValueError(
-                f"Dataset.create_data_rows_sync() supports a max of {max_data_rows_supported} data rows."
+                f"Dataset._create_data_rows_sync() supports a max of {max_data_rows_supported} data rows."
                 " For larger imports use the async function Dataset.create_data_rows()"
             )
         if file_upload_thread_count < 1:
@@ -235,8 +201,6 @@ def create_data_rows(
     ) -> "DataUpsertTask":
         """Asynchronously bulk upload data rows
 
-        Use this instead of `Dataset.create_data_rows_sync` uploads for batches that contain more than 1000 data rows.
-
         Args:
             items (iterable of (dict or str))
 

libs/labelbox/src/labelbox/schema/queue_mode.py

@@ -4,9 +4,3 @@
 class QueueMode(str, Enum):
     Batch = "BATCH"
     Dataset = "DATA_SET"
-
-    @classmethod
-    def _missing_(cls, value):
-        # Parses the deprecated "CATALOG" value back to QueueMode.Batch.
-        if value == "CATALOG":
-            return QueueMode.Batch

libs/labelbox/src/labelbox/schema/slice.py

@@ -53,43 +53,6 @@ class CatalogSlice(Slice):
     Represents a Slice used for filtering data rows in Catalog.
     """
 
-    def get_data_row_ids(self) -> PaginatedCollection:
-        """
-        Fetches all data row ids that match this Slice
-
-        Returns:
-            A PaginatedCollection of mapping of data row ids to global keys
-        """
-
-        warnings.warn(
-            "get_data_row_ids will be deprecated. Use get_data_row_identifiers instead"
-        )
-
-        query_str = """
-            query getDataRowIdsBySavedQueryPyApi($id: ID!, $from: String, $first: Int!) {
-                getDataRowIdsBySavedQuery(input: {
-                    savedQueryId: $id,
-                    after: $from
-                    first: $first
-                }) {
-                    totalCount
-                    nodes
-                    pageInfo {
-                        endCursor
-                        hasNextPage
-                    }
-                }
-            }
-        """
-        return PaginatedCollection(
-            client=self.client,
-            query=query_str,
-            params={"id": str(self.uid)},
-            dereferencing=["getDataRowIdsBySavedQuery", "nodes"],
-            obj_class=lambda _, data_row_id: data_row_id,
-            cursor_path=["getDataRowIdsBySavedQuery", "pageInfo", "endCursor"],
-        )
-
     def get_data_row_identifiers(self) -> PaginatedCollection:
         """
         Fetches all data row ids and global keys (where defined) that match this Slice

libs/labelbox/tests/integration/test_data_rows.py

@@ -500,8 +500,6 @@ def test_create_data_rows_with_metadata(mdo, dataset, image_url):
     [
         ("create_data_rows", "class"),
         ("create_data_rows", "dict"),
-        ("create_data_rows_sync", "class"),
-        ("create_data_rows_sync", "dict"),
         ("create_data_row", "class"),
         ("create_data_row", "dict"),
     ],
@@ -539,7 +537,6 @@ def create_data_row(data_rows):
 
     CREATION_FUNCTION = {
         "create_data_rows": dataset.create_data_rows,
-        "create_data_rows_sync": dataset.create_data_rows_sync,
         "create_data_row": create_data_row,
     }
     data_rows = [METADATA_FIELDS[metadata_obj_type]]
@@ -804,49 +801,6 @@ def test_data_row_attachments(dataset, image_url):
         )
 
 
-def test_create_data_rows_sync_attachments(dataset, image_url):
-    attachments = [
-        ("IMAGE", image_url, "image URL"),
-        ("RAW_TEXT", "test-text", None),
-        ("IMAGE_OVERLAY", image_url, "Overlay"),
-        ("HTML", image_url, None),
-    ]
-    attachments_per_data_row = 3
-    dataset.create_data_rows_sync(
-        [
-            {
-                "row_data": image_url,
-                "external_id": "test-id",
-                "attachments": [
-                    {
-                        "type": attachment_type,
-                        "value": attachment_value,
-                        "name": attachment_name,
-                    }
-                    for _ in range(attachments_per_data_row)
-                ],
-            }
-            for attachment_type, attachment_value, attachment_name in attachments
-        ]
-    )
-    data_rows = list(dataset.data_rows())
-    assert len(data_rows) == len(attachments)
-    for data_row in data_rows:
-        assert len(list(data_row.attachments())) == attachments_per_data_row
-
-
-def test_create_data_rows_sync_mixed_upload(dataset, image_url):
-    n_local = 100
-    n_urls = 100
-    with NamedTemporaryFile() as fp:
-        fp.write("Test data".encode())
-        fp.flush()
-        dataset.create_data_rows_sync(
-            [{DataRow.row_data: image_url}] * n_urls + [fp.name] * n_local
-        )
-    assert len(list(dataset.data_rows())) == n_local + n_urls
-
-
 def test_create_data_row_attachment(data_row):
     att = data_row.create_attachment(
         "IMAGE", "https://example.com/image.jpg", "name"
@@ -1086,53 +1040,6 @@ def test_data_row_delete_and_create_with_same_global_key(
     assert task.result[0]["global_key"] == global_key_1
 
 
-def test_data_row_bulk_creation_sync_with_unique_global_keys(
-    dataset, sample_image
-):
-    global_key_1 = str(uuid.uuid4())
-    global_key_2 = str(uuid.uuid4())
-    global_key_3 = str(uuid.uuid4())
-
-    dataset.create_data_rows_sync(
-        [
-            {DataRow.row_data: sample_image, DataRow.global_key: global_key_1},
-            {DataRow.row_data: sample_image, DataRow.global_key: global_key_2},
-            {DataRow.row_data: sample_image, DataRow.global_key: global_key_3},
-        ]
-    )
-
-    assert {row.global_key for row in dataset.data_rows()} == {
-        global_key_1,
-        global_key_2,
-        global_key_3,
-    }
-
-
-def test_data_row_bulk_creation_sync_with_same_global_keys(
-    dataset, sample_image
-):
-    global_key_1 = str(uuid.uuid4())
-
-    with pytest.raises(ResourceCreationError) as exc_info:
-        dataset.create_data_rows_sync(
-            [
-                {
-                    DataRow.row_data: sample_image,
-                    DataRow.global_key: global_key_1,
-                },
-                {
-                    DataRow.row_data: sample_image,
-                    DataRow.global_key: global_key_1,
-                },
-            ]
-        )
-
-    assert len(list(dataset.data_rows())) == 1
-    assert list(dataset.data_rows())[0].global_key == global_key_1
-    assert "Duplicate global key" in str(exc_info.value)
-    assert exc_info.value.args[1]  # task id
-
-
 @pytest.fixture
 def conversational_data_rows(dataset, conversational_content):
     examples = [
@@ -1174,7 +1081,7 @@ 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.create_data_rows_sync(
+            dataset.(
                 [{**conversational_content, "media_type": "IMAGE"}]
             )
 
@@ -1184,7 +1091,8 @@ def test_create_tiled_layer(dataset, tile_content):
         {**tile_content, "media_type": "TMS_GEO"},
         tile_content,
     ]
-    dataset.create_data_rows_sync(examples)
+    task = dataset.create_data_rows(examples)
+    task.wait_until_done()
     data_rows = list(dataset.data_rows())
     assert len(data_rows) == len(examples)
     for data_row in data_rows:

libs/labelbox/tests/unit/test_queue_mode.py

@@ -3,10 +3,6 @@
 from labelbox.schema.queue_mode import QueueMode
 
 
-def test_parse_deprecated_catalog():
-    assert QueueMode("CATALOG") == QueueMode.Batch
-
-
 def test_parse_batch():
     assert QueueMode("BATCH") == QueueMode.Batch