PR updates

Author: Val Brodsky

tests/integration/annotation_import/conftest.py

@@ -513,14 +513,16 @@ def configured_project(client, initial_dataset, ontology, rand_gen, image_url):
     project._wait_until_data_rows_are_processed(data_row_ids=data_row_ids,
                                                 sleep_interval=3)
 
-    project.create_batch(
+    batch = project.create_batch(
         rand_gen(str),
         data_row_ids,  # sample of data row objects
         5  # priority between 1(Highest) - 5(lowest)
     )
     project.data_row_ids = data_row_ids
 
     yield project
+
+    batch.delete()
     project.delete()
 
 
@@ -614,8 +616,10 @@ def configured_project_with_one_data_row(client, ontology, rand_gen,
     This fixture has only one data row and all predictions will be mapped to it
 
 Custom Data Row IDs Strategy:
-    Individuals can create their own fixture to supply data row ids. 
+    Individuals can supply hard-coded data row ids when a creation of data row is not required. 
     This particular fixture, termed "hardcoded_datarow_id," should be defined locally within a test file.
+    In the future, we can use this approach to inject correct number of rows instead of using configured_project fixture 
+        that creates a data row for each member of ontology (14 in total) for each run.
 """
 
 

tests/integration/annotation_import/test_bulk_import_request.py

@@ -41,13 +41,13 @@ def test_create_from_url(project):
     assert bulk_import_request.state == BulkImportRequestState.RUNNING
 
 
-def test_validate_file(project_with_ontology):
+def test_validate_file(project_with_empty_ontology):
     name = str(uuid.uuid4())
     url = "https://storage.googleapis.com/labelbox-public-bucket/predictions_test_v2.ndjson"
     with pytest.raises(MALValidationError):
-        project_with_ontology.upload_annotations(name=name,
-                                                 annotations=url,
-                                                 validate=True)
+        project_with_empty_ontology.upload_annotations(name=name,
+                                                       annotations=url,
+                                                       validate=True)
         #Schema ids shouldn't match
 
 

tests/integration/conftest.py

@@ -27,6 +27,8 @@
 
 IMG_URL = "https://picsum.photos/200/300.jpg"
 SMALL_DATASET_URL = "https://storage.googleapis.com/lb-artifacts-testing-public/sdk_integration_test/potato.jpeg"
+DATA_ROW_PROCESSING_WAIT_TIMEOUT_SECONDS = 30
+DATA_ROW_PROCESSING_WAIT_SLEEP_INTERNAL_SECONDS = 3
 
 
 class Environ(Enum):
@@ -392,7 +394,7 @@ def initial_dataset(client, rand_gen):
 
 
 @pytest.fixture
-def project_with_ontology(project):
+def project_with_empty_ontology(project):
     editor = list(
         project.client.get_labeling_frontends(
             where=LabelingFrontend.name == "editor"))[0]
@@ -402,13 +404,13 @@ def project_with_ontology(project):
 
 
 @pytest.fixture
-def configured_project(project_with_ontology, initial_dataset, rand_gen,
+def configured_project(project_with_empty_ontology, initial_dataset, rand_gen,
                        image_url):
     dataset = initial_dataset
     data_row_id = dataset.create_data_row(row_data=image_url).uid
-    project = project_with_ontology
+    project = project_with_empty_ontology
 
-    project.create_batch(
+    batch = project.create_batch(
         rand_gen(str),
         [data_row_id],  # sample of data row objects
         5  # priority between 1(Highest) - 5(lowest)
@@ -417,6 +419,8 @@ def configured_project(project_with_ontology, initial_dataset, rand_gen,
 
     yield project
 
+    batch.delete()
+
 
 @pytest.fixture
 def configured_project_with_label(client, rand_gen, image_url, project, dataset,
@@ -426,21 +430,19 @@ def configured_project_with_label(client, rand_gen, image_url, project, dataset,
     Additionally includes a create_label method for any needed extra labels
     One label is already created and yielded when using fixture
     """
-    start_time = time.time()
-    project._wait_until_data_rows_are_processed(data_row_ids=[data_row.uid],
-                                                sleep_interval=3)
+    project._wait_until_data_rows_are_processed(
+        data_row_ids=[data_row.uid],
+        wait_processing_max_seconds=DATA_ROW_PROCESSING_WAIT_TIMEOUT_SECONDS,
+        sleep_interval=DATA_ROW_PROCESSING_WAIT_SLEEP_INTERNAL_SECONDS)
 
     project.create_batch(
         rand_gen(str),
         [data_row.uid],  # sample of data row objects
         5  # priority between 1(Highest) - 5(lowest)
     )
-    print("create_batch took: ", time.time() - start_time)
     ontology = _setup_ontology(project)
-    print("setup ontology took: ", time.time() - start_time)
     label = _create_label(project, data_row, ontology,
                           wait_for_label_processing)
-    print("create_label took: ", time.time() - start_time)
     yield [project, dataset, data_row, label]
 
     for label in project.labels():

tests/integration/export_v2/conftest.py

@@ -297,7 +297,7 @@ def configured_project_with_ontology(client, initial_dataset, ontology,
 
 
 @pytest.fixture
-def configured_project_with_one_data_row(client, ontology, rand_gen):
+def configured_project_without_data_rows(client, ontology, rand_gen):
     project = client.create_project(name=rand_gen(str),
                                     description=rand_gen(str),
                                     queue_mode=QueueMode.Batch)

tests/integration/export_v2/test_export_video.py

@@ -5,11 +5,11 @@
 from labelbox.schema.annotation_import import AnnotationImportState
 
 
-def test_export_v2_video(client, configured_project_with_one_data_row,
+def test_export_v2_video(client, configured_project_without_data_rows,
                          video_data, video_data_row,
                          bbox_video_annotation_objects, rand_gen):
 
-    project = configured_project_with_one_data_row
+    project = configured_project_without_data_rows
     project_id = project.uid
     labels = []
     _, data_row_uids = video_data

tests/integration/test_filtering.py

@@ -15,7 +15,7 @@ def project_to_test_where(client, rand_gen):
     p_b = client.create_project(name=p_b_name, queue_mode=QueueMode.Batch)
     p_c = client.create_project(name=p_c_name, queue_mode=QueueMode.Batch)
 
-    yield p_a, p_b, p_c
+    yield p_a, p_b
 
     p_a.delete()
     p_b.delete()
@@ -26,7 +26,7 @@ def project_to_test_where(client, rand_gen):
 # other builds simultaneously adding projects to test org
 def test_where(client, project_to_test_where):
     p_a, p_b, p_c = project_to_test_where
-    p_a_name, p_b_name, _ = [p.name for p in [p_a, p_b, p_c]]
+    p_a_name, p_b_name = [p.name for p in [p_a, p_b]]
 
     def get(where=None):
         date_where = Project.created_at >= p_a.created_at

tests/integration/test_project.py

@@ -171,15 +171,15 @@ def test_attach_instructions(client, project):
 
 @pytest.mark.skipif(condition=os.environ['LABELBOX_TEST_ENVIRON'] == "onprem",
                     reason="new mutation does not work for onprem")
-def test_html_instructions(project_with_ontology):
+def test_html_instructions(project_with_empty_ontology):
     html_file_path = '/tmp/instructions.html'
     sample_html_str = "<html></html>"
 
     with open(html_file_path, 'w') as file:
         file.write(sample_html_str)
 
-    project_with_ontology.upsert_instructions(html_file_path)
-    updated_ontology = project_with_ontology.ontology().normalized
+    project_with_empty_ontology.upsert_instructions(html_file_path)
+    updated_ontology = project_with_empty_ontology.ontology().normalized
 
     instructions = updated_ontology.pop('projectInstructions')
     assert requests.get(instructions).text == sample_html_str