reconfiguring test folders and also making some updates

Author: jtsodapop

tests/integration/annotation_import/test_bulk_import_request.py

@@ -29,7 +29,7 @@ def test_create_from_url(configured_project):
     assert bulk_import_request.state == BulkImportRequestState.RUNNING
 
 
-def test_validate_file(client, configured_project):
+def test_validate_file(configured_project):
     name = str(uuid.uuid4())
     url = "https://storage.googleapis.com/labelbox-public-bucket/predictions_test_v2.ndjson"
     with pytest.raises(MALValidationError):
@@ -151,7 +151,7 @@ def test_wait_till_done(rectangle_inference, configured_project):
         'uuid']
 
 
-def test_project_bulk_import_requests(client, configured_project, predictions):
+def test_project_bulk_import_requests(configured_project, predictions):
     result = configured_project.bulk_import_requests()
     assert len(list(result)) == 0
 
@@ -174,7 +174,7 @@ def test_project_bulk_import_requests(client, configured_project, predictions):
     assert len(list(result)) == 3
 
 
-def test_delete(client, configured_project, predictions):
+def test_delete(configured_project, predictions):
     name = str(uuid.uuid4())
 
     bulk_import_request = configured_project.upload_annotations(

tests/integration/annotation_import/test_label_import.py

@@ -1,7 +1,5 @@
 import uuid
-import ndjson
 import pytest
-import requests
 
 from labelbox.schema.annotation_import import AnnotationImportState, LabelImport
 """

tests/integration/annotation_import/test_model_run.py

@@ -2,7 +2,8 @@
 
 
 def test_model_run(client, configured_project_with_label, rand_gen):
-    project, label_id = configured_project_with_label
+    project, _, _, label = configured_project_with_label
+    label_id = label.uid
     ontology = project.ontology()
     data = {"name": rand_gen(str), "ontology_id": ontology.uid}
     model = client.create_model(data["name"], data["ontology_id"])

tests/integration/conftest.py

@@ -2,7 +2,6 @@
 import re
 import uuid
 import time
-from collections import namedtuple
 from datetime import datetime
 from enum import Enum
 from random import randint
@@ -158,28 +157,6 @@ def gen(field_type):
 @pytest.fixture
 def project(client, rand_gen):
     project = client.create_project(name=rand_gen(str))
-
-    def create_label(**kwargs):
-        """ Creates a label on a Legacy Editor project. Not supported in the new Editor.
-        Args:
-            **kwargs: Label attributes. At minimum, the label `DataRow`.
-        """
-        Label = Entity.Label
-        kwargs[Label.project] = project
-        kwargs[Label.seconds_to_label] = kwargs.get(Label.seconds_to_label.name,
-                                                    0.0)
-        data = {
-            Label.attribute(attr) if isinstance(attr, str) else attr:
-            value.uid if isinstance(value, DbObject) else value
-            for attr, value in kwargs.items()
-        }
-        query_str, params = query.create(Label, data)
-        query_str = query_str.replace(
-            "data: {", "data: {type: {connect: {name: \"Any\"}} ")
-        res = project.client.execute(query_str, params)
-        return Label(project.client, res["createLabel"])
-
-    project.create_label = create_label
     yield project
     project.delete()
 
@@ -205,21 +182,6 @@ def datarow(dataset, image_url):
     dr.delete()
 
 
-LabelPack = namedtuple("LabelPack", "project dataset data_row label")
-
-
-@pytest.fixture
-def label_pack(project, rand_gen, image_url):
-    client = project.client
-    dataset = client.create_dataset(name=rand_gen(str))
-    project.datasets.connect(dataset)
-    data_row = dataset.create_data_row(row_data=IMG_URL)
-    label = project.create_label(data_row=data_row, label=rand_gen(str))
-    time.sleep(10)
-    yield LabelPack(project, dataset, data_row, label)
-    dataset.delete()
-
-
 @pytest.fixture
 def iframe_url(environ) -> str:
     if environ in [Environ.PROD, Environ.LOCAL]:
@@ -299,6 +261,11 @@ def configured_project(project, client, rand_gen, image_url):
 
 @pytest.fixture
 def configured_project_with_label(client, rand_gen, image_url):
+    """Project with a connected dataset, having one datarow
+    Project contains an ontology with 1 bbox tool
+    Additionally includes a create_label method for any needed extra labels
+    One label is already created and yielded when using fixture
+    """
     project = client.create_project(name=rand_gen(str))
     dataset = client.create_dataset(name=rand_gen(str), projects=project)
     data_row = dataset.create_data_row(row_data=image_url)
@@ -310,7 +277,6 @@ def configured_project_with_label(client, rand_gen, image_url):
         Tool(tool=Tool.Type.BBOX, name="test-bbox-class"),
     ])
     project.setup(editor, ontology_builder.asdict())
-    project.enable_model_assisted_labeling()
     ontology = ontology_builder.from_project(project)
     predictions = [{
         "uuid": str(uuid.uuid4()),
@@ -325,13 +291,26 @@ def configured_project_with_label(client, rand_gen, image_url):
             "width": 50
         }
     }]
-    upload_task = LabelImport.create_from_objects(
-        client, project.uid, f'label-import-{uuid.uuid4()}', predictions)
-    upload_task.wait_until_done()
-    label = next(project.labels()).uid
-    yield [project, label]
+
+    def create_label():
+        """ Ad-hoc function to create a LabelImport
+        
+        Creates a LabelImport task which will create a label
+        """
+        upload_task = LabelImport.create_from_objects(
+            client, project.uid, f'label-import-{uuid.uuid4()}', predictions)
+        upload_task.wait_until_done(sleep_time_seconds=5)
+
+    project.create_label = create_label
+    project.create_label()
+    label = next(project.labels())
+    yield [project, dataset, data_row, label]
     dataset.delete()
     project.delete()
+    data_row.delete()
+
+    for label in project.labels():
+        label.delete()
 
 
 @pytest.fixture

tests/integration/test_batch.py

@@ -20,7 +20,7 @@ def big_dataset(dataset: Dataset):
     dataset.delete()
 
 
-def test_submit_batch(configured_project: Project, big_dataset):
+def test_submit_batch(configured_project: Project, big_dataset: Dataset):
     configured_project.update(queue_mode=QueueMode.Batch)
 
     data_rows = [dr.uid for dr in list(big_dataset.export_data_rows())]

tests/integration/test_benchmark.py

@@ -1,5 +1,5 @@
-def test_benchmark(label_pack):
-    project, _, data_row, label = label_pack
+def test_benchmark(configured_project_with_label):
+    project, _, data_row, label = configured_project_with_label
     assert set(project.benchmarks()) == set()
     assert label.is_benchmark_reference == False
 

tests/integration/test_data_rows.py

@@ -158,10 +158,14 @@ def test_data_row_filtering_sorting(dataset, image_url):
     # Test filtering
     row1 = list(dataset.data_rows(where=DataRow.external_id == "row1"))
     assert len(row1) == 1
+    row1 = dataset.data_rows_for_external_id("row1")
+    assert len(row1) == 1
     row1 = row1[0]
     assert row1.external_id == "row1"
     row2 = list(dataset.data_rows(where=DataRow.external_id == "row2"))
     assert len(row2) == 1
+    row2 = dataset.data_rows_for_external_id("row2")
+    assert len(row2) == 1
     row2 = row2[0]
     assert row2.external_id == "row2"
 

tests/integration/test_delegated_access.py

@@ -41,3 +41,9 @@ def test_no_integration(client, image_url):
     dr = ds.create_data_row(row_data=image_url)
     assert requests.get(dr.row_data).status_code == 200
     ds.delete()
+
+
+def test_no_default_integration(client):
+    ds = client.create_dataset(name="new_ds")
+    assert ds.iam_integration() is None
+    ds.delete()

tests/integration/test_label.py

@@ -1,4 +1,3 @@
-from labelbox.schema.labeling_frontend import LabelingFrontend
 import time
 
 import pytest
@@ -7,11 +6,8 @@
 from labelbox import Label
 
 
-def test_labels(label_pack):
-    project, dataset, data_row, label = label_pack
-
-    # Labels are not visible in the project immediately.
-    time.sleep(10)
+def test_labels(configured_project_with_label):
+    project, _, data_row, label = configured_project_with_label
 
     assert list(project.labels()) == [label]
     assert list(data_row.labels()) == [label]
@@ -23,14 +19,15 @@ def test_labels(label_pack):
     label.delete()
 
     # Labels are not visible in the project immediately.
-    time.sleep(10)
+    time.sleep(5)
 
     assert list(project.labels()) == []
     assert list(data_row.labels()) == []
 
 
-def test_label_export(client, configured_project_with_label):
-    project, label_id = configured_project_with_label
+def test_label_export(configured_project_with_label):
+    project, _, _, label = configured_project_with_label
+    label_id = label.uid
 
     exported_labels_url = project.export_labels()
     assert exported_labels_url is not None
@@ -41,52 +38,35 @@ def test_label_export(client, configured_project_with_label):
     # The new exporter doesn't work with the create_label mutation
 
 
-def test_label_update(label_pack):
-    project, dataset, data_row, label = label_pack
+def test_label_update(configured_project_with_label):
+    _, _, _, label = configured_project_with_label
     label.update(label="something else")
     assert label.label == "something else"
 
 
-def test_label_filter_order(client, project, rand_gen, image_url):
-    dataset_1 = client.create_dataset(name=rand_gen(str), projects=project)
-    dataset_2 = client.create_dataset(name=rand_gen(str), projects=project)
-    data_row_1 = dataset_1.create_data_row(row_data=image_url)
-    data_row_2 = dataset_2.create_data_row(row_data=image_url)
+def test_label_filter_order(configured_project_with_label):
+    project, _, _, label = configured_project_with_label
 
-    l1 = project.create_label(data_row=data_row_1, label="l1")
-    time.sleep(1)  #Ensure there is no race condition
-    l2 = project.create_label(data_row=data_row_2, label="l2")
-
-    # Labels are not visible in the project immediately.
-    time.sleep(20)
+    l1 = label
+    project.create_label()
+    l2 = next(project.labels())
 
-    # Filtering supported on dataset
     assert set(project.labels()) == {l1, l2}
-    assert set(project.labels(datasets=[])) == set()
-    assert set(project.labels(datasets=[dataset_1])) == {l1}
-    assert set(project.labels(datasets=[dataset_2])) == {l2}
-    assert set(project.labels(datasets=[dataset_1, dataset_2])) == {l1, l2}
 
     assert list(project.labels(order_by=Label.created_at.asc)) == [l1, l2]
     assert list(project.labels(order_by=Label.created_at.desc)) == [l2, l1]
 
-    dataset_1.delete()
-    dataset_2.delete()
-    project.delete()
 
+def test_label_bulk_deletion(configured_project_with_label):
+    project, _, _, _ = configured_project_with_label
 
-def test_label_bulk_deletion(project, rand_gen, image_url):
-    dataset = project.client.create_dataset(name=rand_gen(str),
-                                            projects=project)
-    row_1 = dataset.create_data_row(row_data=image_url)
-    row_2 = dataset.create_data_row(row_data=image_url)
-
-    l1 = project.create_label(data_row=row_1, label="l1")
-    l2 = project.create_label(data_row=row_1, label="l2")
-    l3 = project.create_label(data_row=row_2, label="l3")
-
-    # Labels are not visible in the project immediately.
-    time.sleep(10)
+    for _ in range(2):
+        #only run twice, already have one label in the fixture
+        project.create_label()
+    labels = project.labels()
+    l1 = next(labels)
+    l2 = next(labels)
+    l3 = next(labels)
 
     assert set(project.labels()) == {l1, l2, l3}
 
@@ -98,5 +78,3 @@ def test_label_bulk_deletion(project, rand_gen, image_url):
     time.sleep(5)
 
     assert set(project.labels()) == {l2}
-
-    dataset.delete()

tests/integration/test_labeler_performance.py

@@ -1,12 +1,9 @@
 from datetime import datetime, timezone, timedelta
-import time
 import pytest
 
 
-def test_labeler_performance(label_pack):
-    project, dataset, data_row, label = label_pack
-    # Sleep a bit as it seems labeler performance isn't updated immediately.
-    time.sleep(10)
+def test_labeler_performance(configured_project_with_label):
+    project, _, _, _ = configured_project_with_label
 
     labeler_performance = list(project.labeler_performance())
     assert len(labeler_performance) == 1