More updates

Author: Val Brodsky

libs/labelbox/tests/conftest.py

@@ -9,6 +9,7 @@
 import time
 from labelbox.schema.project import Project
 import requests
+from labelbox.schema.ontology import Ontology
 import pytest
 from types import SimpleNamespace
 from typing import Type
@@ -1160,15 +1161,26 @@ def teardown_project_labels_ontology_feature_schemas(project: Project):
         ontology = project.ontology()
         ontology_id = ontology.uid
         client = project.client
-
-        # featureSchemaIds = [tool.feature_schema_id for tool in ontology_builder.tools]
         classification_feature_schema_ids = [
-            feature["featureSchemaId"]
+            feature["schemaNodeId"]
             for feature in ontology.normalized["classifications"]
+        ] + [
+            option["featureSchemaId"]
+            for feature in ontology.normalized["classifications"]
+            for option in feature.get("options", [])
         ]
+
         tool_feature_schema_ids = [
-            feature["featureSchemaId"]
-            for feature in ontology.normalized["tools"]
+            feature["schemaNodeId"] for feature in ontology.normalized["tools"]
+        ] + [
+            classification["featureSchemaId"]
+            for tool in ontology.normalized["tools"]
+            for classification in tool.get("classifications", [])
+        ] + [
+            option["featureSchemaId"]
+            for tool in ontology.normalized["tools"]
+            for classification in tool.get("classifications", [])
+            for option in classification.get("options", [])
         ]
 
         feature_schema_ids = classification_feature_schema_ids + tool_feature_schema_ids
@@ -1179,9 +1191,63 @@ def teardown_project_labels_ontology_feature_schemas(project: Project):
         project.delete()
         client.delete_unused_ontology(ontology_id)
         for feature_schema_id in feature_schema_ids:
-            project.client.delete_unused_feature_schema(feature_schema_id)
+            try:
+                project.client.delete_unused_feature_schema(feature_schema_id)
+            except LabelboxError as e:
+                print(
+                    f"Failed to delete feature schema {feature_schema_id}: {e}")
+
+    @staticmethod
+    def teardown_ontology_feature_schemas(ontology: Ontology):
+        """
+        Call this function to release project, labels, ontology and feature schemas in fixture teardown
+
+        NOTE: exception handling is not required as this is a fixture teardown
+        """
+        ontology_id = ontology.uid
+        client = ontology.client
+        classification_feature_schema_ids = [
+            feature["featureSchemaId"]
+            for feature in ontology.normalized["classifications"]
+        ] + [
+            option["featureSchemaId"]
+            for feature in ontology.normalized["classifications"]
+            for option in feature.get("options", [])
+        ]
+
+        tool_feature_schema_ids = [
+            feature["schemaNodeId"] for feature in ontology.normalized["tools"]
+        ] + [
+            classification["featureSchemaId"]
+            for tool in ontology.normalized["tools"]
+            for classification in tool.get("classifications", [])
+        ] + [
+            option["featureSchemaId"]
+            for tool in ontology.normalized["tools"]
+            for classification in tool.get("classifications", [])
+            for option in classification.get("options", [])
+        ]
+
+        feature_schema_ids = classification_feature_schema_ids + tool_feature_schema_ids
+
+        client.delete_unused_ontology(ontology_id)
+        for feature_schema_id in feature_schema_ids:
+            try:
+                project.client.delete_unused_feature_schema(feature_schema_id)
+            except LabelboxError as e:
+                print(
+                    f"Failed to delete feature schema {feature_schema_id}: {e}")
+
+
+class ModuleTearDownHelpers(TearDownHelpers):
+    ...
 
 
 @pytest.fixture
 def teardown_helpers():
     return TearDownHelpers()
+
+
+@pytest.fixture(scope='module')
+def module_teardown_helpers():
+    return TearDownHelpers()

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

@@ -716,7 +716,6 @@ def _create_project(
     )
 
     project.connect_ontology(ontology)
-
     data_row_data = []
 
     for _ in range(DATA_ROW_COUNT):
@@ -741,15 +740,12 @@ def _create_project(
 
 
 @pytest.fixture
-def configured_project(
-    client: Client,
-    rand_gen,
-    data_row_json_by_media_type,
-    request: FixtureRequest,
-    normalized_ontology_by_media_type,
-    export_v2_test_helpers,
-    llm_prompt_response_creation_dataset_with_data_row,
-):
+def configured_project(client: Client, rand_gen, data_row_json_by_media_type,
+                       request: FixtureRequest,
+                       normalized_ontology_by_media_type,
+                       export_v2_test_helpers,
+                       llm_prompt_response_creation_dataset_with_data_row,
+                       teardown_helpers):
     """Configure project for test. Request.param will contain the media type if not present will use Image MediaType. The project will have 10 data rows."""
 
     media_type = getattr(request, "param", MediaType.Image)
@@ -786,23 +782,18 @@ def configured_project(
 
     yield project
 
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
     if dataset:
         dataset.delete()
 
-    client.delete_unused_ontology(ontology.uid)
-
 
 @pytest.fixture()
-def configured_project_by_global_key(
-    client: Client,
-    rand_gen,
-    data_row_json_by_media_type,
-    request: FixtureRequest,
-    normalized_ontology_by_media_type,
-    export_v2_test_helpers,
-):
+def configured_project_by_global_key(client: Client, rand_gen,
+                                     data_row_json_by_media_type,
+                                     request: FixtureRequest,
+                                     normalized_ontology_by_media_type,
+                                     export_v2_test_helpers, teardown_helpers):
     """Does the same thing as configured project but with global keys focus."""
 
     media_type = getattr(request, "param", MediaType.Image)
@@ -838,22 +829,16 @@ def configured_project_by_global_key(
 
     yield project
 
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
     if dataset:
         dataset.delete()
 
-    client.delete_unused_ontology(ontology.uid)
-
 
 @pytest.fixture(scope="module")
-def module_project(
-    client: Client,
-    rand_gen,
-    data_row_json_by_media_type,
-    request: FixtureRequest,
-    normalized_ontology_by_media_type,
-):
+def module_project(client: Client, rand_gen, data_row_json_by_media_type,
+                   request: FixtureRequest, normalized_ontology_by_media_type,
+                   module_teardown_helpers):
     """Generates a image project that scopes to the test module(file). Used to reduce api calls."""
 
     media_type = getattr(request, "param", MediaType.Image)
@@ -886,13 +871,12 @@ def module_project(
 
     yield project
 
-    project.delete()
+    module_teardown_helpers.teardown_project_labels_ontology_feature_schemas(
+        project)
 
     if dataset:
         dataset.delete()
 
-    client.delete_unused_ontology(ontology.uid)
-
 
 @pytest.fixture
 def prediction_id_mapping(request, normalized_ontology_by_media_type):
@@ -2245,6 +2229,7 @@ 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/data/export/conftest.py

@@ -241,9 +241,8 @@ def polygon_inference(prediction_id_mapping):
 
 
 @pytest.fixture
-def configured_project_with_ontology(
-    client, initial_dataset, ontology, rand_gen, image_url
-):
+def configured_project_with_ontology(client, initial_dataset, ontology,
+                                     rand_gen, image_url, teardown_helpers):
     dataset = initial_dataset
     project = client.create_project(
         name=rand_gen(str),
@@ -264,22 +263,21 @@ def configured_project_with_ontology(
     )
     project.data_row_ids = data_row_ids
     yield project
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
 @pytest.fixture
-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,
-    )
+def configured_project_without_data_rows(client, ontology, rand_gen,
+                                         teardown_helpers):
+    project = client.create_project(name=rand_gen(str),
+                                    description=rand_gen(str),
+                                    queue_mode=QueueMode.Batch)
     editor = list(
         client.get_labeling_frontends(where=LabelingFrontend.name == "editor")
     )[0]
     project.setup(editor, ontology)
     yield project
-    project.delete()
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
 @pytest.fixture