From 78f87a7dc874f2435541a8bed1e4807802bf2542 Mon Sep 17 00:00:00 2001 From: Maciej Kozik Date: Mon, 3 Oct 2022 20:59:24 +0200 Subject: [PATCH 1/5] [QQC-506] Rename CATALOG to BATCHES in QueueMode --- CHANGELOG.md | 5 +++++ labelbox/schema/queue_mode.py | 12 +++++++++++- tests/unit/test_queue_mode.py | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_queue_mode.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 28cacfeba..74998fdc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +# Version 0.0.0 (YYYY-MM-DD) - In Progress + +### Changed +* Update QueueMode enum to support new value for QueueMode.Batch = `BATCHES`. + # Version 3.27.2 (2022-10-04) ### Added diff --git a/labelbox/schema/queue_mode.py b/labelbox/schema/queue_mode.py index 355e982c5..2f0ac5ca5 100644 --- a/labelbox/schema/queue_mode.py +++ b/labelbox/schema/queue_mode.py @@ -1,6 +1,16 @@ from enum import Enum +import logging + +logger = logging.getLogger(__name__) + class QueueMode(str, Enum): - Batch = "CATALOG" + Batch = "BATCHES" Dataset = "DATA_SET" + + @classmethod + def _missing_(cls, value): + # Parses the deprecated "CATALOG" value back to QueueMode.Batch. + if value == "CATALOG": + return QueueMode.Batch diff --git a/tests/unit/test_queue_mode.py b/tests/unit/test_queue_mode.py new file mode 100644 index 000000000..e4606cd07 --- /dev/null +++ b/tests/unit/test_queue_mode.py @@ -0,0 +1,20 @@ +import pytest + +from labelbox.schema.queue_mode import QueueMode + + +def test_parse_deprecated_catalog(): + assert QueueMode("CATALOG") == QueueMode.Batch + + +def test_parse_batches(): + assert QueueMode("BATCHES") == QueueMode.Batch + + +def test_parse_data_set(): + assert QueueMode("DATA_SET") == QueueMode.Dataset + + +def test_fails_for_unknown(): + with pytest.raises(ValueError): + QueueMode("foo") From bc39734abe3dfc2297f0a0d66225696d53128698 Mon Sep 17 00:00:00 2001 From: Maciej Kozik Date: Mon, 3 Oct 2022 21:00:03 +0200 Subject: [PATCH 2/5] [QQC-506] Remove logging from queue_mode --- labelbox/schema/queue_mode.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/labelbox/schema/queue_mode.py b/labelbox/schema/queue_mode.py index 2f0ac5ca5..e0977098b 100644 --- a/labelbox/schema/queue_mode.py +++ b/labelbox/schema/queue_mode.py @@ -1,9 +1,5 @@ from enum import Enum -import logging - -logger = logging.getLogger(__name__) - class QueueMode(str, Enum): Batch = "BATCHES" From 85194a069198ce20053d4e163c759e7c01b016af Mon Sep 17 00:00:00 2001 From: Maciej Kozik Date: Wed, 5 Oct 2022 18:11:42 +0200 Subject: [PATCH 3/5] Batches -> Batch --- labelbox/schema/queue_mode.py | 2 +- tests/unit/test_queue_mode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/labelbox/schema/queue_mode.py b/labelbox/schema/queue_mode.py index e0977098b..333e92987 100644 --- a/labelbox/schema/queue_mode.py +++ b/labelbox/schema/queue_mode.py @@ -2,7 +2,7 @@ class QueueMode(str, Enum): - Batch = "BATCHES" + Batch = "BATCH" Dataset = "DATA_SET" @classmethod diff --git a/tests/unit/test_queue_mode.py b/tests/unit/test_queue_mode.py index e4606cd07..ea7996e29 100644 --- a/tests/unit/test_queue_mode.py +++ b/tests/unit/test_queue_mode.py @@ -8,7 +8,7 @@ def test_parse_deprecated_catalog(): def test_parse_batches(): - assert QueueMode("BATCHES") == QueueMode.Batch + assert QueueMode("BATCH") == QueueMode.Batch def test_parse_data_set(): From 1ad1ab175914219c578d6db6bf888b13e7413da0 Mon Sep 17 00:00:00 2001 From: Maciej Kozik Date: Wed, 5 Oct 2022 18:13:59 +0200 Subject: [PATCH 4/5] Batches -> Batch --- CHANGELOG.md | 4 ++-- tests/unit/test_queue_mode.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74998fdc6..080c19aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Changelog # Version 0.0.0 (YYYY-MM-DD) - In Progress - +g ### Changed -* Update QueueMode enum to support new value for QueueMode.Batch = `BATCHES`. +* Update QueueMode enum to support new value for QueueMode.Batch = `BATCH`. # Version 3.27.2 (2022-10-04) diff --git a/tests/unit/test_queue_mode.py b/tests/unit/test_queue_mode.py index ea7996e29..a07b14a54 100644 --- a/tests/unit/test_queue_mode.py +++ b/tests/unit/test_queue_mode.py @@ -7,7 +7,7 @@ def test_parse_deprecated_catalog(): assert QueueMode("CATALOG") == QueueMode.Batch -def test_parse_batches(): +def test_parse_batch(): assert QueueMode("BATCH") == QueueMode.Batch From aa5fb803ed45c3957a2d18160f7a6eab304eb0d0 Mon Sep 17 00:00:00 2001 From: Maciej Kozik Date: Wed, 5 Oct 2022 18:14:25 +0200 Subject: [PATCH 5/5] fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 080c19aca..3bf435ffc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog # Version 0.0.0 (YYYY-MM-DD) - In Progress -g + ### Changed * Update QueueMode enum to support new value for QueueMode.Batch = `BATCH`.