More fixture support

Author: Val Brodsky

libs/labelbox/tests/conftest.py

@@ -636,20 +636,17 @@ def organization(client):
 
 
 @pytest.fixture
-def configured_project_with_label(
-    client,
-    rand_gen,
-    image_url,
-    project,
-    dataset,
-    data_row,
-    wait_for_label_processing,
-):
+def configured_project_with_label(client, rand_gen, dataset, data_row,
+                                  wait_for_label_processing, teardown_helpers):
     """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),
+                                    queue_mode=QueueMode.Batch,
+                                    media_type=MediaType.Image)
     project._wait_until_data_rows_are_processed(
         data_row_ids=[data_row.uid],
         wait_processing_max_seconds=DATA_ROW_PROCESSING_WAIT_TIMEOUT_SECONDS,
@@ -667,9 +664,7 @@ def configured_project_with_label(
     )
     yield [project, dataset, data_row, label]
 
-    client.delete_unused_ontology(ontology.uid)
-    for label in project.labels():
-        label.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
 def _create_label(project, data_row, ontology, wait_for_label_processing):
@@ -1187,19 +1182,24 @@ def teardown_project_labels_ontology_feature_schemas(project: Project):
         client = project.client
 
         # featureSchemaIds = [tool.feature_schema_id for tool in ontology_builder.tools]
-        featureSchemaIds = [
+        classification_feature_schema_ids = [
             feature["featureSchemaId"]
             for feature in ontology.normalized["classifications"]
         ]
+        tool_feature_schema_ids = [
+            feature["featureSchemaId"]
+            for feature in ontology.normalized["tools"]
+        ]
 
+        feature_schema_ids = classification_feature_schema_ids + tool_feature_schema_ids
         labels = list(project.labels())
         for label in labels:
             label.delete()
 
         project.delete()
         client.delete_unused_ontology(ontology_id)
-        for featureSchemaId in featureSchemaIds:
-            project.client.delete_unused_feature_schema(featureSchemaId)
+        for feature_schema_id in feature_schema_ids:
+            project.client.delete_unused_feature_schema(feature_schema_id)
 
 
 @pytest.fixture

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

@@ -7,13 +7,22 @@
 from labelbox import DataSplit, ModelRun
 
 
-@pytest.mark.order(1)
-def test_model_run(client, configured_project_with_label, data_row, rand_gen):
+@pytest.fixture
+def current_model(client, configured_project_with_label, rand_gen):
     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"])
+
+    model = client.create_model(rand_gen(str), ontology.uid)
+    yield model
+
+    model.delete()
+
+
+def test_model_run(client, configured_project_with_label, current_model,
+                   data_row, rand_gen):
+    _, _, _, label = configured_project_with_label
+    label_id = label.uid
+    model = current_model
 
     name = rand_gen(str)
     config = {"batch_size": 100, "reruns": None}