More fixes

Author: Val Brodsky

libs/labelbox/tests/conftest.py

@@ -1044,14 +1044,11 @@ def project_with_empty_ontology(project):
 
 
 @pytest.fixture
-def configured_project_with_complex_ontology(
-    client, initial_dataset, rand_gen, image_url
-):
-    project = client.create_project(
-        name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
-        media_type=MediaType.Image,
-    )
+def configured_project_with_complex_ontology(client, initial_dataset, rand_gen,
+                                             image_url, teardown_helpers):
+    project = client.create_project(name=rand_gen(str),
+                                    queue_mode=QueueMode.Batch,
+                                    media_type=MediaType.Image)
     dataset = initial_dataset
     data_row = dataset.create_data_row(row_data=image_url)
     data_row_ids = [data_row.uid]
@@ -1110,7 +1107,7 @@ def configured_project_with_complex_ontology(
     project.setup(editor, ontology.asdict())
 
     yield [project, data_row]
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
 @pytest.fixture
@@ -1129,13 +1126,13 @@ def valid_model_id():
 
 
 @pytest.fixture
-def requested_labeling_service(
-    rand_gen,
-    live_chat_evaluation_project_with_new_dataset,
-    chat_evaluation_ontology,
-    model_config,
-):
-    project = live_chat_evaluation_project_with_new_dataset
+def requested_labeling_service(rand_gen, client, chat_evaluation_ontology,
+                               model_config, teardown_helpers):
+    project_name = f"test-model-evaluation-project-{rand_gen(str)}"
+    dataset_name = f"test-model-evaluation-dataset-{rand_gen(str)}"
+    project = client.create_model_evaluation_project(name=project_name,
+                                                     dataset_name=dataset_name,
+                                                     data_row_count=1)
     project.connect_ontology(chat_evaluation_ontology)
 
     project.upsert_instructions("tests/integration/media/sample_pdf.pdf")
@@ -1148,6 +1145,8 @@ def requested_labeling_service(
 
     yield project, project.get_labeling_service()
 
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
+
 
 class TearDownHelpers:
 

libs/labelbox/tests/data/annotation_import/conftest.py

@@ -2245,7 +2245,6 @@ def to_pascal_case(name: str) -> str:
     def find_data_row_filter(data_row):
         return lambda dr: dr["data_row"]["id"] == data_row.uid
 
-
 @pytest.fixture
 def helpers():
     return Helpers

libs/labelbox/tests/integration/conftest.py

@@ -112,14 +112,11 @@ def configured_project(
 
 
 @pytest.fixture
-def configured_project_with_complex_ontology(
-    client, initial_dataset, rand_gen, image_url
-):
-    project = client.create_project(
-        name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
-        media_type=MediaType.Image,
-    )
+def configured_project_with_complex_ontology(client, initial_dataset, rand_gen,
+                                             image_url, teardown_helpers):
+    project = client.create_project(name=rand_gen(str),
+                                    queue_mode=QueueMode.Batch,
+                                    media_type=MediaType.Image)
     dataset = initial_dataset
     data_row = dataset.create_data_row(row_data=image_url)
     data_row_ids = [data_row.uid]
@@ -178,7 +175,7 @@ def configured_project_with_complex_ontology(
     project.setup(editor, ontology.asdict())
 
     yield [project, data_row]
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
 @pytest.fixture