Fix tests

Author: Val Brodsky

libs/labelbox/src/labelbox/project_validation.py

@@ -40,7 +40,7 @@ class _CoreProjectInput(BaseModel):
     def validate_fields(self):
         if (
             self.auto_audit_percentage is not None
-            and self.auto_audit_number_of_labels is not None
+            or self.auto_audit_number_of_labels is not None
         ):
             raise ValueError(
                 "quality_modes must be set instead of auto_audit_percentage or auto_audit_number_of_labels."
@@ -67,9 +67,8 @@ def validate_fields(self):
             )
         elif self.quality_modes == {QualityMode.Consensus}:
             self._set_quality_mode_attributes(
-                data,
-                CONSENSUS_AUTO_AUDIT_NUMBER_OF_LABELS,
-                CONSENSUS_AUTO_AUDIT_PERCENTAGE,
+                number_of_labels=CONSENSUS_AUTO_AUDIT_NUMBER_OF_LABELS,
+                percentage=CONSENSUS_AUTO_AUDIT_PERCENTAGE,
                 is_consensus_enabled=True,
             )
 

libs/labelbox/tests/conftest.py

@@ -453,7 +453,7 @@ def project(client, rand_gen):
 def consensus_project(client, rand_gen):
     project = client.create_project(
         name=rand_gen(str),
-        quality_mode=QualityMode.Consensus,
+        quality_modes={QualityMode.Consensus},
         media_type=MediaType.Image,
     )
     yield project

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

@@ -285,6 +285,23 @@ def configured_project_without_data_rows(
     teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
 
 
+@pytest.fixture
+def configured_video_project_without_data_rows(
+    client, ontology, rand_gen, teardown_helpers
+):
+    project = client.create_project(
+        name=rand_gen(str),
+        description=rand_gen(str),
+        media_type=MediaType.Video,
+    )
+    editor = list(
+        client.get_labeling_frontends(where=LabelingFrontend.name == "editor")
+    )[0]
+    project.setup(editor, ontology)
+    yield project
+    teardown_helpers.teardown_project_labels_ontology_feature_schemas(project)
+
+
 @pytest.fixture
 def model_run_with_data_rows(
     client,

libs/labelbox/tests/data/export/streamable/test_export_video_streamable.py

@@ -21,13 +21,13 @@ def org_id(self, client):
     def test_export(
         self,
         client,
-        configured_project_without_data_rows,
+        configured_video_project_without_data_rows,
         video_data,
         video_data_row,
         bbox_video_annotation_objects,
         rand_gen,
     ):
-        project = configured_project_without_data_rows
+        project = configured_video_project_without_data_rows
         project_id = project.uid
         labels = []
 

libs/labelbox/tests/integration/test_client_errors.py

@@ -81,34 +81,6 @@ def test_network_error(client):
         client.create_project(name="Project name", media_type=MediaType.Image)
 
 
-def test_invalid_attribute_error(
-    client,
-    rand_gen,
-):
-    # Creation
-    with pytest.raises(lbox.exceptions.InvalidAttributeError) as excinfo:
-        client.create_project(
-            name="Name", invalid_field="Whatever", media_type=MediaType.Image
-        )
-    assert excinfo.value.db_object_type == Project
-    assert excinfo.value.field == "invalid_field"
-
-    # Update
-    project = client.create_project(
-        name=rand_gen(str), media_type=MediaType.Image
-    )
-    with pytest.raises(lbox.exceptions.InvalidAttributeError) as excinfo:
-        project.update(invalid_field="Whatever")
-    assert excinfo.value.db_object_type == Project
-    assert excinfo.value.field == "invalid_field"
-
-    # Top-level-fetch
-    with pytest.raises(lbox.exceptions.InvalidAttributeError) as excinfo:
-        client.get_projects(where=User.email == "email")
-    assert excinfo.value.db_object_type == Project
-    assert excinfo.value.field == {User.email}
-
-
 @pytest.mark.skip("timeouts cause failure before rate limit")
 def test_api_limit_error(client):
     def get(arg):

libs/labelbox/tests/integration/test_filtering.py

@@ -1,9 +1,8 @@
 import pytest
 from lbox.exceptions import InvalidQueryError
-from libs.labelbox.src.labelbox.schema.media_type import MediaType
 
 from labelbox import Project
-from labelbox.schema import media_type
+from labelbox.schema.media_type import MediaType
 
 
 @pytest.fixture

libs/labelbox/tests/integration/test_legacy_project.py

@@ -1,20 +1,12 @@
+from os import name
+
 import pytest
+from pydantic import ValidationError
 
 from labelbox.schema import media_type
 from labelbox.schema.media_type import MediaType
 
 
-def test_project_dataset(client, rand_gen):
-    with pytest.raises(
-        ValueError,
-        match="Dataset queue mode is deprecated. Please prefer Batch queue mode.",
-    ):
-        client.create_project(
-            name=rand_gen(str),
-            media_type=MediaType.Image,
-        )
-
-
 def test_project_auto_audit_parameters(client, rand_gen):
     with pytest.raises(
         ValueError,
@@ -27,7 +19,7 @@ def test_project_auto_audit_parameters(client, rand_gen):
         )
 
     with pytest.raises(
-        ValueError,
+        ValidationError,
         match="quality_modes must be set instead of auto_audit_percentage or auto_audit_number_of_labels.",
     ):
         client.create_project(
@@ -39,11 +31,6 @@ def test_project_auto_audit_parameters(client, rand_gen):
 
 def test_project_name_parameter(client, rand_gen):
     with pytest.raises(
-        ValueError, match="project name must be a valid string."
-    ):
-        client.create_project()
-
-    with pytest.raises(
-        ValueError, match="project name must be a valid string."
+        ValidationError, match="project name must be a valid string"
     ):
-        client.create_project(name="     ")
+        client.create_project(name="     ", media_type=MediaType.Image)

libs/labelbox/tests/unit/schema/test_user_group.py

@@ -32,6 +32,7 @@ def group_project():
     project_values = defaultdict(lambda: None)
     project_values["id"] = "project_id"
     project_values["name"] = "Test Project"
+    project_values["queueMode"] = QueueMode.Batch.value
     project_values["editorTaskType"] = EditorTaskType.Missing.value
     project_values["mediaType"] = MediaType.Image.value
     return Project(MagicMock(Client), project_values)