Merge pull request #1020 from Labelbox/kkim/AL-5313

[AL-5313] Remove deletedDataRowGlobalKey from get_data_row_ids_for_global_keys()

Author: kkim-labelbox

labelbox/client.py

@@ -1394,7 +1394,6 @@ def _format_failed_rows(rows: List[str],
                 fetchedDataRows { id }
                 notFoundGlobalKeys
                 accessDeniedGlobalKeys
-                deletedDataRowGlobalKeys
                 } jobStatus}}
             """
         result_params = {
@@ -1417,9 +1416,6 @@ def _format_failed_rows(rows: List[str],
                 errors.extend(
                     _format_failed_rows(data['accessDeniedGlobalKeys'],
                                         "Access denied to Data Row"))
-                errors.extend(
-                    _format_failed_rows(data['deletedDataRowGlobalKeys'],
-                                        "Data Row deleted"))
 
                 # Invalid results may contain empty string, so we must filter
                 # them prior to checking for PARTIAL_SUCCESS
@@ -1436,13 +1432,6 @@ def _format_failed_rows(rows: List[str],
                         "There are errors present. Please look at 'errors' in the returned dict for more details"
                     )
 
-                # Deprecation notice for deletedDataRowGlobalKeys portion of results
-                if len(data['deletedDataRowGlobalKeys']) > 0:
-                    logger.warning(
-                        """Deprecation Notice: This function will soon no longer return 'Deleted Data Rows' 
-                        as part of the 'results'. Global keys for deleted data rows will soon be placed under 
-                        'Data Row not found' portion.""")
-
                 return {"status": status, "results": results, "errors": errors}
             elif res["dataRowsForGlobalKeysResult"]['jobStatus'] == "FAILED":
                 raise labelbox.exceptions.LabelboxError(

tests/integration/test_global_keys.py

@@ -152,64 +152,6 @@ def test_global_key_with_whitespaces_validation(client, dataset, image_url):
     ])
 
 
-@pytest.mark.skip(reason='get_data_rows_for_global_keys not included in '
-                  'the initial release of global_keys')
-def test_get_data_rows_for_global_keys(client, dataset, image_url):
-    gk_1 = str(uuid.uuid4())
-    gk_2 = str(uuid.uuid4())
-
-    dr_1 = dataset.create_data_row(row_data=image_url,
-                                   external_id="hello",
-                                   global_key=gk_1)
-    dr_2 = dataset.create_data_row(row_data=image_url,
-                                   external_id="world",
-                                   global_key=gk_2)
-
-    res = client.get_data_rows_for_global_keys([gk_1])
-    assert res['status'] == "SUCCESS"
-    assert res['errors'] == []
-    assert res['results'] == [dr_1]
-
-    res = client.get_data_rows_for_global_keys([gk_2])
-    assert res['status'] == "SUCCESS"
-    assert res['errors'] == []
-    assert res['results'] == [dr_2]
-
-    res = client.get_data_rows_for_global_keys([gk_1, gk_2])
-    assert res['status'] == "SUCCESS"
-    assert res['errors'] == []
-    assert res['results'] == [dr_1, dr_2]
-
-
-@pytest.mark.skip(reason='get_data_rows_for_global_keys not included in '
-                  'the initial release of global_keys')
-def test_get_data_rows_for_invalid_global_keys(client, dataset, image_url):
-    gk_1 = str(uuid.uuid4())
-    gk_2 = str(uuid.uuid4())
-
-    dr_1 = dataset.create_data_row(row_data=image_url, external_id="hello")
-    dr_2 = dataset.create_data_row(row_data=image_url,
-                                   external_id="world",
-                                   global_key=gk_2)
-
-    res = client.get_data_rows_for_global_keys([gk_1])
-    assert res['status'] == "FAILURE"
-    assert len(res['errors']) == 1
-    assert res['errors'][0]['error'] == "Data Row not found"
-    assert res['errors'][0]['global_key'] == gk_1
-
-    res = client.get_data_rows_for_global_keys([gk_1, gk_2])
-    assert res['status'] == "PARTIAL SUCCESS"
-
-    assert len(res['errors']) == 1
-    assert len(res['results']) == 1
-
-    assert res['errors'][0]['error'] == "Data Row not found"
-    assert res['errors'][0]['global_key'] == gk_1
-
-    assert res['results'][0] == dr_2
-
-
 def test_get_data_row_ids_for_global_keys(client, dataset, image_url):
     gk_1 = str(uuid.uuid4())
     gk_2 = str(uuid.uuid4())