Vb/merge 5.2 2 (#1867)

vbrodsky · real-mjozwiak · Gabefire · Val Brodsky · commit 50e917d94eef · 2024-10-11T10:58:44.000-07:00
Co-authored-by: Michał Jóźwiak &lt;mjozwiak@labelbox.com&gt;
Co-authored-by: Gabe &lt;33893811+Gabefire@users.noreply.github.com&gt;
Co-authored-by: sfendell-labelbox &lt;150080555+sfendell-labelbox@users.noreply.github.com&gt;
Co-authored-by: mnoszczak &lt;99751601+mnoszczak@users.noreply.github.com&gt;
diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml
@@ -15,7 +15,7 @@ dependencies = [
     "lbox-clients==1.1.0",
 ]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.9,<3.13"
 classifiers = [
     # How mature is this project?
     "Development Status :: 5 - Production/Stable",
diff --git a/libs/labelbox/src/labelbox/__init__.py b/libs/labelbox/src/labelbox/__init__.py
@@ -12,7 +12,6 @@
 from labelbox.schema.asset_attachment import AssetAttachment
 from labelbox.schema.batch import Batch
 from labelbox.schema.benchmark import Benchmark
-from labelbox.schema.bulk_import_request import BulkImportRequest
 from labelbox.schema.catalog import Catalog
 from labelbox.schema.data_row import DataRow
 from labelbox.schema.data_row_metadata import (
@@ -86,7 +85,6 @@
     ProjectOverviewDetailed,
 )
 from labelbox.schema.project_resource_tag import ProjectResourceTag
-from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.resource_tag import ResourceTag
 from labelbox.schema.review import Review
 from labelbox.schema.role import ProjectRole, Role
diff --git a/libs/labelbox/src/labelbox/client.py b/libs/labelbox/src/labelbox/client.py
@@ -585,7 +585,7 @@ def create_dataset(
             )
 
             if not validation_result["validateDataset"]["valid"]:
-                raise LabelboxError(
+                raise labelbox.exceptions.LabelboxError(
                     "IAMIntegration was not successfully added to the dataset."
                 )
         except Exception as e:
@@ -683,13 +683,8 @@ def create_model_evaluation_project(
         append_to_existing_dataset = bool(dataset_id)
 
         if dataset_name_or_id:
-            kwargs["dataset_name_or_id"] = dataset_name_or_id
-            kwargs["append_to_existing_dataset"] = append_to_existing_dataset
             if data_row_count is None:
                 data_row_count = 100
-            if data_row_count < 0:
-                raise ValueError("data_row_count must be a positive integer.")
-            kwargs["data_row_count"] = data_row_count
             warnings.warn(
                 "Automatic generation of data rows of live model evaluation projects is deprecated. dataset_name_or_id, append_to_existing_dataset, data_row_count will be removed in a future version.",
                 DeprecationWarning,
diff --git a/libs/labelbox/src/labelbox/project_validation.py b/libs/labelbox/src/labelbox/project_validation.py
@@ -69,6 +69,9 @@ def validate_fields(self):
                 is_consensus_enabled=True,
             )
 
+        if self.data_row_count is not None and self.data_row_count < 0:
+            raise ValueError("data_row_count must be a positive integer.")
+
         return self
 
     def _set_quality_mode_attributes(
diff --git a/libs/labelbox/src/labelbox/schema/catalog.py b/libs/labelbox/src/labelbox/schema/catalog.py
@@ -48,7 +48,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/src/labelbox/schema/data_row.py b/libs/labelbox/src/labelbox/schema/data_row.py
@@ -280,7 +280,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/src/labelbox/schema/dataset.py b/libs/labelbox/src/labelbox/schema/dataset.py
@@ -360,7 +360,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/src/labelbox/schema/model_run.py b/libs/labelbox/src/labelbox/schema/model_run.py
@@ -541,7 +541,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/src/labelbox/schema/project.py b/libs/labelbox/src/labelbox/schema/project.py
@@ -417,7 +417,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/src/labelbox/schema/slice.py b/libs/labelbox/src/labelbox/schema/slice.py
@@ -129,7 +129,7 @@ def export_v2(
         """
 
         warnings.warn(
-            "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
+            "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",
             DeprecationWarning,
             stacklevel=2,
         )
diff --git a/libs/labelbox/tests/conftest.py b/libs/labelbox/tests/conftest.py
@@ -19,6 +19,7 @@
     Client,
     DataRow,
     Dataset,
+    LabelingFrontend,
     MediaType,
     OntologyBuilder,
     Option,
diff --git a/libs/labelbox/tests/data/export/conftest.py b/libs/labelbox/tests/data/export/conftest.py
@@ -1,8 +1,9 @@
 import time
-from labelbox import MediaType, Client
 import uuid
+
 import pytest
 
+from labelbox import Client, MediaType
 from labelbox.schema.annotation_import import AnnotationImportState, LabelImport
 from labelbox.schema.labeling_frontend import LabelingFrontend
 from labelbox.schema.media_type import MediaType
diff --git a/libs/labelbox/tests/integration/conftest.py b/libs/labelbox/tests/integration/conftest.py
@@ -5,6 +5,7 @@
 import time
 import uuid
 from collections import defaultdict
+from datetime import datetime, timezone
 from enum import Enum
 from itertools import islice
 from types import SimpleNamespace
@@ -25,7 +26,13 @@
     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.data_row import DataRowMetadataField
+from labelbox.schema.enums import AnnotationImportState
+from labelbox.schema.invite import Invite
 from labelbox.schema.ontology_kind import OntologyKind
 from labelbox.schema.queue_mode import QueueMode
 from labelbox.schema.user import User
diff --git a/libs/labelbox/tests/integration/test_labeling_service.py b/libs/labelbox/tests/integration/test_labeling_service.py
@@ -1,7 +1,6 @@
 import pytest
 from lbox.exceptions import (
     LabelboxError,
-    MalformedQueryException,
     ResourceNotFoundError,
 )
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies = [`
`15`	`15`	`"lbox-clients==1.1.0",`
`16`	`16`	`]`
`17`	`17`	`readme = "README.md"`
`18`		`-requires-python = ">=3.9"`
	`18`	`+requires-python = ">=3.9,<3.13"`
`19`	`19`	`classifiers = [`
`20`	`20`	`# How mature is this project?`
`21`	`21`	`"Development Status :: 5 - Production/Stable",`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ def validate_fields(self):`
`69`	`69`	`is_consensus_enabled=True,`
`70`	`70`	`)`
`71`	`71`
	`72`	`+ if self.data_row_count is not None and self.data_row_count < 0:`
	`73`	`+ raise ValueError("data_row_count must be a positive integer.")`
	`74`	`+`
`72`	`75`	`return self`
`73`	`76`
`74`	`77`	`def _set_quality_mode_attributes(`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def export_v2(`
`48`	`48`	`"""`
`49`	`49`
`50`	`50`	`warnings.warn(`
`51`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`51`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`52`	`52`	`DeprecationWarning,`
`53`	`53`	`stacklevel=2,`
`54`	`54`	`)`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ def export_v2(`
`280`	`280`	`"""`
`281`	`281`
`282`	`282`	`warnings.warn(`
`283`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`283`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`284`	`284`	`DeprecationWarning,`
`285`	`285`	`stacklevel=2,`
`286`	`286`	`)`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ def export_v2(`
`360`	`360`	`"""`
`361`	`361`
`362`	`362`	`warnings.warn(`
`363`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`363`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`364`	`364`	`DeprecationWarning,`
`365`	`365`	`stacklevel=2,`
`366`	`366`	`)`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ def export_v2(`
`541`	`541`	`"""`
`542`	`542`
`543`	`543`	`warnings.warn(`
`544`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`544`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`545`	`545`	`DeprecationWarning,`
`546`	`546`	`stacklevel=2,`
`547`	`547`	`)`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ def export_v2(`
`417`	`417`	`"""`
`418`	`418`
`419`	`419`	`warnings.warn(`
`420`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`420`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`421`	`421`	`DeprecationWarning,`
`422`	`422`	`stacklevel=2,`
`423`	`423`	`)`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ def export_v2(`
`129`	`129`	`"""`
`130`	`130`
`131`	`131`	`warnings.warn(`
`132`		`- "You are currently utilizing export_v2 for this action, which will be deprecated in a V7. Please refer to docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
	`132`	`+ "You are currently utilizing export_v2 for this action, which will be removed in 7.0. Please refer to our docs for export alternatives. https://docs.labelbox.com/reference/export-overview#export-methods",`
`133`	`133`	`DeprecationWarning,`
`134`	`134`	`stacklevel=2,`
`135`	`135`	`)`