Removed queue_mode

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

@@ -32,7 +32,6 @@
 from labelbox.schema.ontology import Ontology
 from labelbox.schema.project import Project
 from labelbox.schema.quality_mode import QualityMode
-from labelbox.schema.queue_mode import QueueMode
 
 IMG_URL = "https://picsum.photos/200/300.jpg"
 MASKABLE_IMG_URL = "https://storage.googleapis.com/labelbox-datasets/image_sample_data/2560px-Kitano_Street_Kobe01s5s4110.jpeg"
@@ -444,7 +443,6 @@ def conversation_entity_data_row(client, rand_gen):
 def project(client, rand_gen):
     project = client.create_project(
         name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     yield project
@@ -455,8 +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,
-        queue_mode=QueueMode.Batch,
+        quality_modes={QualityMode.Consensus},
         media_type=MediaType.Image,
     )
     yield project
@@ -646,7 +643,6 @@ def configured_project_with_label(
     """
     project = client.create_project(
         name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     project._wait_until_data_rows_are_processed(
@@ -749,7 +745,6 @@ def configured_batch_project_with_label(
     """
     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())]
@@ -784,7 +779,6 @@ def configured_batch_project_with_multiple_datarows(
     """
     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]
@@ -1065,7 +1059,6 @@ def configured_project_with_complex_ontology(
 ):
     project = client.create_project(
         name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     dataset = initial_dataset

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

@@ -6,7 +6,6 @@
 from labelbox.schema.annotation_import import AnnotationImportState, LabelImport
 from labelbox.schema.labeling_frontend import LabelingFrontend
 from labelbox.schema.media_type import MediaType
-from labelbox.schema.queue_mode import QueueMode
 
 
 @pytest.fixture
@@ -249,7 +248,6 @@ def configured_project_with_ontology(
     dataset = initial_dataset
     project = client.create_project(
         name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     editor = list(
@@ -277,7 +275,6 @@ def configured_project_without_data_rows(
     project = client.create_project(
         name=rand_gen(str),
         description=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     editor = list(
@@ -288,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/conftest.py

@@ -1,42 +1,40 @@
-from collections import defaultdict
-from itertools import islice
 import json
 import os
-import sys
 import re
+import sys
 import time
 import uuid
-import requests
-from types import SimpleNamespace
-from typing import Type, List
+from collections import defaultdict
 from enum import Enum
-from typing import Tuple
+from itertools import islice
+from types import SimpleNamespace
+from typing import List, Tuple, Type
 
 import pytest
 import requests
 
-from labelbox import Dataset, DataRow
-from labelbox import LabelingFrontend
 from labelbox import (
-    OntologyBuilder,
-    Tool,
-    Option,
     Classification,
+    Client,
+    DataRow,
+    Dataset,
+    LabelingFrontend,
     MediaType,
+    OntologyBuilder,
+    Option,
     PromptResponseClassification,
     ResponseOption,
+    Tool,
 )
 from labelbox.orm import query
 from labelbox.pagination import PaginatedCollection
 from labelbox.schema.annotation_import import LabelImport
 from labelbox.schema.catalog import Catalog
 from labelbox.schema.enums import AnnotationImportState
 from labelbox.schema.invite import Invite
+from labelbox.schema.ontology_kind import OntologyKind
 from labelbox.schema.quality_mode import QualityMode
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.user import User
-from labelbox import Client
-from labelbox.schema.ontology_kind import OntologyKind
 
 
 @pytest.fixture
@@ -69,7 +67,6 @@ def project_pack(client):
     projects = [
         client.create_project(
             name=f"user-proj-{idx}",
-            queue_mode=QueueMode.Batch,
             media_type=MediaType.Image,
         )
         for idx in range(2)
@@ -117,7 +114,6 @@ def configured_project_with_complex_ontology(
 ):
     project = client.create_project(
         name=rand_gen(str),
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     dataset = initial_dataset

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,10 +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.queue_mode import QueueMode
+from labelbox.schema.media_type import MediaType
 
 
 @pytest.fixture

libs/labelbox/tests/integration/test_legacy_project.py

@@ -1,20 +1,10 @@
+from os import name
+
 import pytest
+from pydantic import ValidationError
 
 from labelbox.schema import media_type
 from labelbox.schema.media_type import MediaType
-from labelbox.schema.queue_mode import QueueMode
-
-
-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),
-            queue_mode=QueueMode.Dataset,
-            media_type=MediaType.Image,
-        )
 
 
 def test_project_auto_audit_parameters(client, rand_gen):
@@ -29,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(
@@ -41,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/integration/test_ontology.py

@@ -1,11 +1,10 @@
-import pytest
-
-from labelbox import OntologyBuilder, MediaType, Tool
-from labelbox.orm.model import Entity
 import json
 import time
 
-from labelbox.schema.queue_mode import QueueMode
+import pytest
+
+from labelbox import MediaType, OntologyBuilder, Tool
+from labelbox.orm.model import Entity
 
 
 def test_feature_schema_is_not_archived(client, ontology):
@@ -99,7 +98,6 @@ def test_deletes_an_ontology(client):
 def test_cant_delete_an_ontology_with_project(client):
     project = client.create_project(
         name="test project",
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     tool = client.upsert_feature_schema(point.asdict())
@@ -187,7 +185,6 @@ def test_does_not_include_used_ontologies(client):
     )
     project = client.create_project(
         name="test project",
-        queue_mode=QueueMode.Batch,
         media_type=MediaType.Image,
     )
     project.connect_ontology(ontology_with_project)

libs/labelbox/tests/integration/test_project.py

@@ -10,14 +10,12 @@
 from labelbox.schema import media_type
 from labelbox.schema.media_type import MediaType
 from labelbox.schema.quality_mode import QualityMode
-from labelbox.schema.queue_mode import QueueMode
 
 
 def test_project(client, rand_gen):
     data = {
         "name": rand_gen(str),
         "description": rand_gen(str),
-        "queue_mode": QueueMode.Batch.Batch,
         "media_type": MediaType.Image,
     }
     project = client.create_project(**data)