Skip to content

Commit 8599b4f

Browse files
committed
Remove queue mode as something to set
1 parent af38e1f commit 8599b4f

File tree

9 files changed

+3
-52
lines changed

9 files changed

+3
-52
lines changed

libs/labelbox/src/labelbox/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
from labelbox.schema.project_resource_tag import ProjectResourceTag
6060
from labelbox.schema.media_type import MediaType
6161
from labelbox.schema.slice import Slice, CatalogSlice, ModelSlice
62-
from labelbox.schema.queue_mode import QueueMode
6362
from labelbox.schema.task_queue import TaskQueue
6463
from labelbox.schema.label_score import LabelScore
6564
from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds

libs/labelbox/src/labelbox/client.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
CONSENSUS_AUTO_AUDIT_PERCENTAGE,
7373
QualityMode,
7474
)
75-
from labelbox.schema.queue_mode import QueueMode
7675
from labelbox.schema.role import Role
7776
from labelbox.schema.search_filters import SearchFilter
7877
from labelbox.schema.send_to_annotate_params import (
@@ -465,16 +464,16 @@ def _create(self, db_object_type, data, extra_params={}):
465464

466465
data = {**data, **extra_params}
467466
query_string, params = query.create(db_object_type, data)
467+
print(query_string)
468468
res = self.execute(
469469
query_string, params, raise_return_resource_not_found=True
470470
)
471-
472471
if not res:
473472
raise LabelboxError(
474473
"Failed to create %s" % db_object_type.type_name()
475474
)
476475
res = res["create%s" % db_object_type.type_name()]
477-
476+
print(res)
478477
return db_object_type(self, res)
479478

480479
def create_model_config(
@@ -621,7 +620,6 @@ def create_project(
621620
name (str): A name for the project
622621
description (str): A short summary for the project
623622
media_type (MediaType): The type of assets that this project will accept
624-
queue_mode (Optional[QueueMode]): The queue mode to use
625623
quality_modes (Optional[List[QualityMode]]): The quality modes to use (e.g. Benchmark, Consensus). Defaults to
626624
Benchmark.
627625
is_benchmark_enabled (Optional[bool]): Whether the project supports benchmark. Defaults to None.
@@ -853,11 +851,7 @@ def create_response_creation_project(
853851
return self._create_project(_CoreProjectInput(**input))
854852

855853
def _create_project(self, input: _CoreProjectInput) -> Project:
856-
media_type_value = input.media_type.value
857-
858854
params = input.model_dump(exclude_none=True)
859-
if media_type_value:
860-
params["media_type"] = media_type_value
861855

862856
extra_params = {
863857
Field.String("dataset_name_or_id"): params.pop(

libs/labelbox/src/labelbox/project_validation.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
CONSENSUS_AUTO_AUDIT_PERCENTAGE,
1212
QualityMode,
1313
)
14-
from labelbox.schema.queue_mode import QueueMode
1514

1615
PositiveInt = Annotated[int, Field(gt=0)]
1716

@@ -20,7 +19,6 @@ class _CoreProjectInput(BaseModel):
2019
name: str
2120
description: Optional[str] = None
2221
media_type: MediaType
23-
queue_mode: QueueMode = Field(default=QueueMode.Batch, frozen=True)
2422
auto_audit_percentage: Optional[float] = None
2523
auto_audit_number_of_labels: Optional[int] = None
2624
quality_modes: Optional[Set[QualityMode]] = Field(
@@ -33,7 +31,7 @@ class _CoreProjectInput(BaseModel):
3331
data_row_count: Optional[PositiveInt] = None
3432
editor_task_type: Optional[EditorTaskType] = None
3533

36-
model_config = ConfigDict(extra="forbid")
34+
model_config = ConfigDict(extra="forbid", use_enum_values=True)
3735

3836
@model_validator(mode="after")
3937
def validate_fields(self):

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
ProjectOverview,
6262
ProjectOverviewDetailed,
6363
)
64-
from labelbox.schema.queue_mode import QueueMode
6564
from labelbox.schema.resource_tag import ResourceTag
6665
from labelbox.schema.task import Task
6766
from labelbox.schema.task_queue import TaskQueue
@@ -109,7 +108,6 @@ class Project(DbObject, Updateable, Deletable):
109108
created_at (datetime)
110109
setup_complete (datetime)
111110
last_activity_time (datetime)
112-
queue_mode (string)
113111
auto_audit_number_of_labels (int)
114112
auto_audit_percentage (float)
115113
is_benchmark_enabled (bool)
@@ -132,7 +130,6 @@ class Project(DbObject, Updateable, Deletable):
132130
created_at = Field.DateTime("created_at")
133131
setup_complete = Field.DateTime("setup_complete")
134132
last_activity_time = Field.DateTime("last_activity_time")
135-
queue_mode = Field.Enum(QueueMode, "queue_mode")
136133
auto_audit_number_of_labels = Field.Int("auto_audit_number_of_labels")
137134
auto_audit_percentage = Field.Float("auto_audit_percentage")
138135
# Bind data_type and allowedMediaTYpe using the GraphQL type MediaType
@@ -734,9 +731,6 @@ def create_batch(
734731
Raises:
735732
lbox.exceptions.ValueError if a project is not batch mode, if the project is auto data generation, if the batch exceeds 100k data rows
736733
"""
737-
# @TODO: make this automatic?
738-
if self.queue_mode != QueueMode.Batch:
739-
raise ValueError("Project must be in batch mode")
740734

741735
if self.is_auto_data_generation():
742736
raise ValueError(
@@ -816,9 +810,6 @@ def create_batches(
816810
Returns: a task for the created batches
817811
"""
818812

819-
if self.queue_mode != QueueMode.Batch:
820-
raise ValueError("Project must be in batch mode")
821-
822813
dr_ids = []
823814
if data_rows is not None:
824815
for dr in data_rows:
@@ -901,9 +892,6 @@ def create_batches_from_dataset(
901892
Returns: a task for the created batches
902893
"""
903894

904-
if self.queue_mode != QueueMode.Batch:
905-
raise ValueError("Project must be in batch mode")
906-
907895
if consensus_settings:
908896
consensus_settings = ConsensusSettings(
909897
**consensus_settings

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from labelbox.schema.media_type import MediaType
1515
from labelbox.schema.ontology_kind import EditorTaskType
1616
from labelbox.schema.project import Project
17-
from labelbox.schema.queue_mode import QueueMode
1817
from labelbox.schema.user import User
1918

2019

@@ -411,7 +410,6 @@ def _get_projects_set(self, project_nodes):
411410
project_values = defaultdict(lambda: None)
412411
project_values["id"] = project["id"]
413412
project_values["name"] = project["name"]
414-
project_values["queueMode"] = QueueMode.Batch.value
415413
project_values["editorTaskType"] = EditorTaskType.Missing.value
416414
project_values["mediaType"] = MediaType.Image.value
417415
projects.add(Project(self.client, project_values))

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from labelbox.schema.media_type import MediaType
1515
from labelbox.schema.ontology_kind import EditorTaskType
1616
from labelbox.schema.project import Project
17-
from labelbox.schema.queue_mode import QueueMode
1817
from labelbox.schema.user import User
1918
from labelbox.schema.user_group import UserGroup, UserGroupColor
2019

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

libs/labelbox/tests/unit/test_project.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def project_entity():
2121
"editorTaskType": "MODEL_CHAT_EVALUATION",
2222
"lastActivityTime": "2021-06-01T00:00:00.000Z",
2323
"allowedMediaType": "IMAGE",
24-
"queueMode": "BATCH",
2524
"setupComplete": "2021-06-01T00:00:00.000Z",
2625
"modelSetupComplete": None,
2726
"uploadType": "Auto",
@@ -62,7 +61,6 @@ def test_project_editor_task_type(
6261
"editorTaskType": api_editor_task_type,
6362
"lastActivityTime": "2021-06-01T00:00:00.000Z",
6463
"allowedMediaType": "IMAGE",
65-
"queueMode": "BATCH",
6664
"setupComplete": "2021-06-01T00:00:00.000Z",
6765
"modelSetupComplete": None,
6866
"uploadType": "Auto",

libs/labelbox/tests/unit/test_queue_mode.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)