Remove queue mode as something to set

Author: Gabefire

libs/labelbox/src/labelbox/__init__.py

@@ -59,7 +59,6 @@
 from labelbox.schema.project_resource_tag import ProjectResourceTag
 from labelbox.schema.media_type import MediaType
 from labelbox.schema.slice import Slice, CatalogSlice, ModelSlice
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.task_queue import TaskQueue
 from labelbox.schema.label_score import LabelScore
 from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds

libs/labelbox/src/labelbox/client.py

@@ -72,7 +72,6 @@
     CONSENSUS_AUTO_AUDIT_PERCENTAGE,
     QualityMode,
 )
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.role import Role
 from labelbox.schema.search_filters import SearchFilter
 from labelbox.schema.send_to_annotate_params import (
@@ -465,16 +464,16 @@ def _create(self, db_object_type, data, extra_params={}):
 
         data = {**data, **extra_params}
         query_string, params = query.create(db_object_type, data)
+        print(query_string)
         res = self.execute(
             query_string, params, raise_return_resource_not_found=True
         )
-
         if not res:
             raise LabelboxError(
                 "Failed to create %s" % db_object_type.type_name()
             )
         res = res["create%s" % db_object_type.type_name()]
-
+        print(res)
         return db_object_type(self, res)
 
     def create_model_config(
@@ -621,7 +620,6 @@ def create_project(
             name (str): A name for the project
             description (str): A short summary for the project
             media_type (MediaType): The type of assets that this project will accept
-            queue_mode (Optional[QueueMode]): The queue mode to use
             quality_modes (Optional[List[QualityMode]]): The quality modes to use (e.g. Benchmark, Consensus). Defaults to
                 Benchmark.
             is_benchmark_enabled (Optional[bool]): Whether the project supports benchmark. Defaults to None.
@@ -853,11 +851,7 @@ def create_response_creation_project(
         return self._create_project(_CoreProjectInput(**input))
 
     def _create_project(self, input: _CoreProjectInput) -> Project:
-        media_type_value = input.media_type.value
-
         params = input.model_dump(exclude_none=True)
-        if media_type_value:
-            params["media_type"] = media_type_value
 
         extra_params = {
             Field.String("dataset_name_or_id"): params.pop(

libs/labelbox/src/labelbox/project_validation.py

@@ -11,7 +11,6 @@
     CONSENSUS_AUTO_AUDIT_PERCENTAGE,
     QualityMode,
 )
-from labelbox.schema.queue_mode import QueueMode
 
 PositiveInt = Annotated[int, Field(gt=0)]
 
@@ -20,7 +19,6 @@ class _CoreProjectInput(BaseModel):
     name: str
     description: Optional[str] = None
     media_type: MediaType
-    queue_mode: QueueMode = Field(default=QueueMode.Batch, frozen=True)
     auto_audit_percentage: Optional[float] = None
     auto_audit_number_of_labels: Optional[int] = None
     quality_modes: Optional[Set[QualityMode]] = Field(
@@ -33,7 +31,7 @@ class _CoreProjectInput(BaseModel):
     data_row_count: Optional[PositiveInt] = None
     editor_task_type: Optional[EditorTaskType] = None
 
-    model_config = ConfigDict(extra="forbid")
+    model_config = ConfigDict(extra="forbid", use_enum_values=True)
 
     @model_validator(mode="after")
     def validate_fields(self):

libs/labelbox/src/labelbox/schema/project.py

@@ -61,7 +61,6 @@
     ProjectOverview,
     ProjectOverviewDetailed,
 )
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.resource_tag import ResourceTag
 from labelbox.schema.task import Task
 from labelbox.schema.task_queue import TaskQueue
@@ -109,7 +108,6 @@ class Project(DbObject, Updateable, Deletable):
         created_at (datetime)
         setup_complete (datetime)
         last_activity_time (datetime)
-        queue_mode (string)
         auto_audit_number_of_labels (int)
         auto_audit_percentage (float)
         is_benchmark_enabled (bool)
@@ -132,7 +130,6 @@ class Project(DbObject, Updateable, Deletable):
     created_at = Field.DateTime("created_at")
     setup_complete = Field.DateTime("setup_complete")
     last_activity_time = Field.DateTime("last_activity_time")
-    queue_mode = Field.Enum(QueueMode, "queue_mode")
     auto_audit_number_of_labels = Field.Int("auto_audit_number_of_labels")
     auto_audit_percentage = Field.Float("auto_audit_percentage")
     # Bind data_type and allowedMediaTYpe using the GraphQL type MediaType
@@ -734,9 +731,6 @@ def create_batch(
         Raises:
             lbox.exceptions.ValueError if a project is not batch mode, if the project is auto data generation, if the batch exceeds 100k data rows
         """
-        # @TODO: make this automatic?
-        if self.queue_mode != QueueMode.Batch:
-            raise ValueError("Project must be in batch mode")
 
         if self.is_auto_data_generation():
             raise ValueError(
@@ -816,9 +810,6 @@ def create_batches(
         Returns: a task for the created batches
         """
 
-        if self.queue_mode != QueueMode.Batch:
-            raise ValueError("Project must be in batch mode")
-
         dr_ids = []
         if data_rows is not None:
             for dr in data_rows:
@@ -901,9 +892,6 @@ def create_batches_from_dataset(
         Returns: a task for the created batches
         """
 
-        if self.queue_mode != QueueMode.Batch:
-            raise ValueError("Project must be in batch mode")
-
         if consensus_settings:
             consensus_settings = ConsensusSettings(
                 **consensus_settings

libs/labelbox/src/labelbox/schema/queue_mode.py

@@ -14,7 +14,6 @@
 from labelbox.schema.media_type import MediaType
 from labelbox.schema.ontology_kind import EditorTaskType
 from labelbox.schema.project import Project
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.user import User
 
 
@@ -411,7 +410,6 @@ def _get_projects_set(self, project_nodes):
             project_values = defaultdict(lambda: None)
             project_values["id"] = project["id"]
             project_values["name"] = project["name"]
-            project_values["queueMode"] = QueueMode.Batch.value
             project_values["editorTaskType"] = EditorTaskType.Missing.value
             project_values["mediaType"] = MediaType.Image.value
             projects.add(Project(self.client, project_values))

libs/labelbox/src/labelbox/schema/user_group.py

@@ -14,7 +14,6 @@
 from labelbox.schema.media_type import MediaType
 from labelbox.schema.ontology_kind import EditorTaskType
 from labelbox.schema.project import Project
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.user import User
 from labelbox.schema.user_group import UserGroup, UserGroupColor
 
@@ -32,7 +31,6 @@ 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)

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

@@ -21,7 +21,6 @@ def project_entity():
             "editorTaskType": "MODEL_CHAT_EVALUATION",
             "lastActivityTime": "2021-06-01T00:00:00.000Z",
             "allowedMediaType": "IMAGE",
-            "queueMode": "BATCH",
             "setupComplete": "2021-06-01T00:00:00.000Z",
             "modelSetupComplete": None,
             "uploadType": "Auto",
@@ -62,7 +61,6 @@ def test_project_editor_task_type(
             "editorTaskType": api_editor_task_type,
             "lastActivityTime": "2021-06-01T00:00:00.000Z",
             "allowedMediaType": "IMAGE",
-            "queueMode": "BATCH",
             "setupComplete": "2021-06-01T00:00:00.000Z",
             "modelSetupComplete": None,
             "uploadType": "Auto",