Initial fix to delete feature schema resources

Author: Val Brodsky

libs/labelbox/tests/conftest.py

@@ -666,6 +666,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()
 
@@ -735,14 +736,16 @@ def big_dataset(dataset: Dataset):
 
 
 @pytest.fixture
-def configured_batch_project_with_label(
-    project, dataset, data_row, wait_for_label_processing
-):
+def configured_batch_project_with_label(client, dataset, data_row,
+                                        wait_for_label_processing):
     """Project with a batch 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)
     data_rows = [dr.uid for dr in list(dataset.data_rows())]
     project._wait_until_data_rows_are_processed(
         data_row_ids=data_rows, sleep_interval=3
@@ -757,18 +760,22 @@ def configured_batch_project_with_label(
 
     yield [project, dataset, data_row, label]
 
+    project.client.delete_unused_ontology(ontology.uid)
     for label in project.labels():
         label.delete()
 
 
 @pytest.fixture
-def configured_batch_project_with_multiple_datarows(
-    project, dataset, data_rows, wait_for_label_processing
-):
+def configured_batch_project_with_multiple_datarows(client, dataset, data_rows,
+                                                    wait_for_label_processing,
+                                                    rand_gen):
     """Project with a batch having multiple datarows
     Project contains an ontology with 1 bbox tool
     Additionally includes a create_label method for any needed extra labels
     """
+    project = client.create_project(name=rand_gen(str),
+                                    queue_mode=QueueMode.Batch,
+                                    media_type=MediaType.Image)
     global_keys = [dr.global_key for dr in data_rows]
 
     batch_name = f"batch {uuid.uuid4()}"
@@ -780,9 +787,19 @@ def configured_batch_project_with_multiple_datarows(
 
     yield [project, dataset, data_rows]
 
+    featureSchemaIds = [tool.feature_schema_id for tool in ontology.tools]
+    ontology = project.ontology()
+    ontology_id = ontology.uid
+    client = project.client
+
     for label in project.labels():
         label.delete()
 
+    project.delete()
+    client.delete_unused_ontology(ontology_id)
+    for featureSchemaId in featureSchemaIds:
+        project.client.delete_unused_feature_schema(featureSchemaId)
+
 
 @pytest.fixture
 def configured_batch_project_for_labeling_service(

libs/labelbox/tests/integration/test_feature_schema.py

@@ -58,30 +58,24 @@ def test_throws_an_error_if_feature_schema_to_delete_doesnt_exist(client):
         client.delete_unused_feature_schema("doesntexist")
 
 
-def test_updates_a_feature_schema_title(client):
-    tool = client.upsert_feature_schema(point.asdict())
-    feature_schema_id = tool.normalized["featureSchemaId"]
+def test_updates_a_feature_schema_title(client, feature_schema):
+    feature_schema_id = feature_schema.normalized['featureSchemaId']
     new_title = "new title"
     updated_feature_schema = client.update_feature_schema_title(
         feature_schema_id, new_title
     )
 
     assert updated_feature_schema.normalized["name"] == new_title
 
-    client.delete_unused_feature_schema(feature_schema_id)
-
 
 def test_throws_an_error_when_updating_a_feature_schema_with_empty_title(
-    client,
-):
-    tool = client.upsert_feature_schema(point.asdict())
-    feature_schema_id = tool.normalized["featureSchemaId"]
+        client, feature_schema):
+    tool = feature_schema
+    feature_schema_id = tool.normalized['featureSchemaId']
 
     with pytest.raises(Exception):
         client.update_feature_schema_title(feature_schema_id, "")
 
-    client.delete_unused_feature_schema(feature_schema_id)
-
 
 def test_throws_an_error_when_updating_not_existing_feature_schema(client):
     with pytest.raises(Exception):
@@ -107,15 +101,9 @@ def test_updates_a_feature_schema(client, feature_schema):
     assert updated_feature_schema.normalized["name"] == "new name"
 
 
-<<<<<<< HEAD
-def test_does_not_include_used_feature_schema(client):
-    tool = client.upsert_feature_schema(point.asdict())
-    feature_schema_id = tool.normalized["featureSchemaId"]
-=======
 def test_does_not_include_used_feature_schema(client, feature_schema):
     tool = feature_schema
     feature_schema_id = tool.normalized['featureSchemaId']
->>>>>>> b54a37e7 (Followup update for the feature schema test)
     ontology = client.create_ontology_from_feature_schemas(
         name="ontology name",
         feature_schema_ids=[feature_schema_id],