labelbox 3.78.2__tar.gz → 5.0.0__tar.gz

{labelbox-3.78.2 → labelbox-5.0.0}/CHANGELOG.md

@@ -1,8 +1,20 @@
 # Changelog
-# Version 3.78.2 (2025-01-15)
+# Version 5.0.0 (2024-09-16)
+## Updated
+* Set tasks_remaining_count to None LabelingServiceDashboard if labeling has not started ([#1817](https://github.com/Labelbox/labelbox-python/pull/1817))
+* Improve error messaging when creating LLM project with invalid dataset id parameter([#1799](https://github.com/Labelbox/labelbox-python/pull/1799))
+## Removed
+* BREAKING CHANGE SDK methods for exports v1([#1800](https://github.com/Labelbox/labelbox-python/pull/1800))
+* BREAKING CHANGE Unused labelbox_v1 serialization package([#1803](https://github.com/Labelbox/labelbox-python/pull/1803))
+## Fixed
+* Cuid dependencies that cause a crash if numpy is not installed ([#1807](https://github.com/Labelbox/labelbox-python/pull/1807))
+
+# Version 4.0.0 (2024-09-10)
+## Added
+* BREAKING CHANGE for pydantic V1 users: Converted SDK to use pydantic V2([#1738](https://github.com/Labelbox/labelbox-python/pull/1738))
+* Automation test support for multiple sdk versions([#1792](https://github.com/Labelbox/labelbox-python/pull/1792))
 ## Fixed
-* Exporter encoding
-  * NOTE: backported from v.5.2.1
+* Flaky tests([#1793](https://github.com/Labelbox/labelbox-python/pull/1793))
 
 # Version 3.78.1 (2024-09-10)
 ## Fixed

{labelbox-3.78.2 → labelbox-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: labelbox
-Version: 3.78.2
+Version: 5.0.0
 Summary: Labelbox Python API
 Project-URL: Homepage, https://labelbox.com/
 Project-URL: Documentation, https://labelbox-python.readthedocs.io/en/latest/
@@ -26,7 +26,7 @@ Requires-Python: >=3.8
 Requires-Dist: geojson>=3.1.0
 Requires-Dist: google-api-core>=1.22.1
 Requires-Dist: mypy==1.10.1
-Requires-Dist: pydantic>=1.8
+Requires-Dist: pydantic>=2.0
 Requires-Dist: python-dateutil<2.10.0,>=2.8.2
 Requires-Dist: requests>=2.22.0
 Requires-Dist: strenum>=0.4.15

{labelbox-3.78.2 → labelbox-5.0.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "labelbox"
-version = "3.78.2"
+version = "5.0.0"
 description = "Labelbox Python API"
 authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }]
 dependencies = [
     "google-api-core>=1.22.1",
-    "pydantic>=1.8",
+    "pydantic>=2.0",
     "python-dateutil>=2.8.2, <2.10.0",
     "requests>=2.22.0",
     "strenum>=0.4.15",
@@ -64,7 +64,6 @@ build-backend = "hatchling.build"
 [tool.rye]
 managed = true
 dev-dependencies = [
-    "yapf>=0.40.2",
     "mypy>=1.9.0",
     "types-pillow>=10.2.0.20240311",
     "types-python-dateutil>=2.9.0.20240316",
@@ -72,6 +71,9 @@ dev-dependencies = [
     "types-tqdm>=4.66.0.20240106",
 ]
 
+[tool.ruff]
+line-length = 80
+
 [tool.rye.scripts]
 unit = "pytest tests/unit"
 # https://github.com/Labelbox/labelbox-python/blob/7c84fdffbc14fd1f69d2a6abdcc0087dc557fa4e/Makefile
@@ -87,9 +89,9 @@ unit = "pytest tests/unit"
 # LABELBOX_TEST_BASE_URL="http://host.docker.internal:8080" \
 integration = { cmd = "pytest tests/integration" }
 data = { cmd = "pytest tests/data" }
-yapf-lint = "yapf tests src -i --verbose --recursive --parallel --style \"google\""
+rye-fmt-check = "rye fmt --check"
 mypy-lint = "mypy src --pretty --show-error-codes --non-interactive --install-types"
-lint = { chain = ["yapf-lint", "mypy-lint"] }
+lint = { chain = ["mypy-lint", "rye-fmt-check"] }
 test = { chain = ["lint", "unit", "integration"] }
 
 [tool.hatch.metadata]

{labelbox-3.78.2 → labelbox-5.0.0}/src/labelbox/__init__.py

@@ -1,73 +1,79 @@
 name = "labelbox"
 
-__version__ = "3.78.2"
+__version__ = "5.0.0"
 
 from labelbox.client import Client
+from labelbox.schema.project import Project
+from labelbox.schema.model import Model
+from labelbox.schema.model_config import ModelConfig
+from labelbox.schema.bulk_import_request import BulkImportRequest
 from labelbox.schema.annotation_import import (
-    LabelImport,
     MALPredictionImport,
     MEAPredictionImport,
+    LabelImport,
     MEAToMALPredictionImport,
 )
-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 (
-    DataRowMetadata,
-    DataRowMetadataField,
-    DataRowMetadataOntology,
-    DeleteDataRowMetadata,
-)
 from labelbox.schema.dataset import Dataset
+from labelbox.schema.data_row import DataRow
+from labelbox.schema.catalog import Catalog
 from labelbox.schema.enums import AnnotationImportState
+from labelbox.schema.label import Label
+from labelbox.schema.batch import Batch
+from labelbox.schema.review import Review
+from labelbox.schema.user import User
+from labelbox.schema.organization import Organization
+from labelbox.schema.task import Task
 from labelbox.schema.export_task import (
-    BufferedJsonConverterOutput,
+    StreamType,
     ExportTask,
-    FileConverter,
-    FileConverterOutput,
     JsonConverter,
     JsonConverterOutput,
-    StreamType,
+    FileConverter,
+    FileConverterOutput,
+    BufferedJsonConverterOutput,
 )
-from labelbox.schema.iam_integration import IAMIntegration
-from labelbox.schema.identifiable import GlobalKey, UniqueId
-from labelbox.schema.identifiables import DataRowIds, GlobalKeys, UniqueIds
-from labelbox.schema.invite import Invite, InviteLimit
-from labelbox.schema.label import Label
-from labelbox.schema.label_score import LabelScore
-from labelbox.schema.labeling_frontend import LabelingFrontend, LabelingFrontendOptions
-from labelbox.schema.labeling_service import LabelingService
-from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
-from labelbox.schema.labeling_service_status import LabelingServiceStatus
-from labelbox.schema.media_type import MediaType
-from labelbox.schema.model import Model
-from labelbox.schema.model_config import ModelConfig
-from labelbox.schema.model_run import DataSplit, ModelRun
+from labelbox.schema.labeling_frontend import (
+    LabelingFrontend,
+    LabelingFrontendOptions,
+)
+from labelbox.schema.asset_attachment import AssetAttachment
+from labelbox.schema.webhook import Webhook
 from labelbox.schema.ontology import (
-    Classification,
-    FeatureSchema,
     Ontology,
     OntologyBuilder,
+    Classification,
     Option,
-    PromptResponseClassification,
-    ResponseOption,
     Tool,
+    FeatureSchema,
 )
-from labelbox.schema.ontology_kind import OntologyKind
-from labelbox.schema.organization import Organization
-from labelbox.schema.project import Project
+from labelbox.schema.ontology import PromptResponseClassification
+from labelbox.schema.ontology import ResponseOption
+from labelbox.schema.role import Role, ProjectRole
+from labelbox.schema.invite import Invite, InviteLimit
+from labelbox.schema.data_row_metadata import (
+    DataRowMetadataOntology,
+    DataRowMetadataField,
+    DataRowMetadata,
+    DeleteDataRowMetadata,
+)
+from labelbox.schema.model_run import ModelRun, DataSplit
+from labelbox.schema.benchmark import Benchmark
+from labelbox.schema.iam_integration import IAMIntegration
+from labelbox.schema.resource_tag import ResourceTag
 from labelbox.schema.project_model_config import ProjectModelConfig
-from labelbox.schema.project_overview import ProjectOverview, ProjectOverviewDetailed
 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.resource_tag import ResourceTag
-from labelbox.schema.review import Review
-from labelbox.schema.role import ProjectRole, Role
-from labelbox.schema.slice import CatalogSlice, ModelSlice, Slice
-from labelbox.schema.task import Task
 from labelbox.schema.task_queue import TaskQueue
-from labelbox.schema.user import User
-from labelbox.schema.webhook import Webhook
+from labelbox.schema.label_score import LabelScore
+from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds
+from labelbox.schema.identifiable import UniqueId, GlobalKey
+from labelbox.schema.ontology_kind import OntologyKind
+from labelbox.schema.project_overview import (
+    ProjectOverview,
+    ProjectOverviewDetailed,
+)
+from labelbox.schema.labeling_service import LabelingService
+from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
+from labelbox.schema.labeling_service_status import LabelingServiceStatus

{labelbox-3.78.2 → labelbox-5.0.0}/src/labelbox/adv_client.py

@@ -12,7 +12,6 @@ logger = logging.getLogger(__name__)
 
 
 class AdvClient:
-
     def __init__(self, endpoint: str, api_key: str):
         self.endpoint = endpoint
         self.api_key = api_key
@@ -32,8 +31,9 @@ class AdvClient:
         return self._request("GET", "/adv/v1/embeddings").get("results", [])
 
     def import_vectors_from_file(self, id: str, file_path: str, callback=None):
-        self._send_ndjson(f"/adv/v1/embeddings/{id}/_import_ndjson", file_path,
-                          callback)
+        self._send_ndjson(
+            f"/adv/v1/embeddings/{id}/_import_ndjson", file_path, callback
+        )
 
     def get_imported_vector_count(self, id: str) -> int:
         data = self._request("GET", f"/adv/v1/embeddings/{id}/vectors/_count")
@@ -41,38 +41,42 @@ class AdvClient:
 
     def _create_session(self) -> Session:
         session = requests.session()
-        session.headers.update({
-            "Authorization": f"Bearer {self.api_key}",
-            "Content-Type": "application/json"
-        })
+        session.headers.update(
+            {
+                "Authorization": f"Bearer {self.api_key}",
+                "Content-Type": "application/json",
+            }
+        )
         return session
 
-    def _request(self,
-                 method: str,
-                 path: str,
-                 data: Optional[Dict[str, Any]] = None,
-                 headers: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+    def _request(
+        self,
+        method: str,
+        path: str,
+        data: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, Any]] = None,
+    ) -> Dict[str, Any]:
         url = f"{self.endpoint}{path}"
         requests_data = None
         if data:
             requests_data = json.dumps(data)
-        response = self.session.request(method,
-                                        url,
-                                        data=requests_data,
-                                        headers=headers)
+        response = self.session.request(
+            method, url, data=requests_data, headers=headers
+        )
         if response.status_code != requests.codes.ok:
-            message = response.json().get('message')
+            message = response.json().get("message")
             if message:
                 raise LabelboxError(message)
             else:
                 response.raise_for_status()
         return response.json()
 
-    def _send_ndjson(self,
-                     path: str,
-                     file_path: str,
-                     callback: Optional[Callable[[Dict[str, Any]],
-                                                 None]] = None):
+    def _send_ndjson(
+        self,
+        path: str,
+        file_path: str,
+        callback: Optional[Callable[[Dict[str, Any]], None]] = None,
+    ):
         """
         Sends an NDJson file in chunks.
 
@@ -87,7 +91,7 @@ class AdvClient:
             _headers = {
                 "Content-Type": "application/x-ndjson",
                 "X-Content-Lines": str(_count),
-                "Content-Length": str(buffer.tell())
+                "Content-Length": str(buffer.tell()),
             }
             rsp = self._send_bytes(f"{self.endpoint}{path}", _buffer, _headers)
             rsp.raise_for_status()
@@ -96,7 +100,7 @@ class AdvClient:
 
         buffer = io.BytesIO()
         count = 0
-        with open(file_path, 'rb') as fp:
+        with open(file_path, "rb") as fp:
             for line in fp:
                 buffer.write(line)
                 count += 1
@@ -107,10 +111,12 @@ class AdvClient:
         if count:
             upload_chunk(buffer, count)
 
-    def _send_bytes(self,
-                    url: str,
-                    buffer: io.BytesIO,
-                    headers: Optional[Dict[str, Any]] = None) -> Response:
+    def _send_bytes(
+        self,
+        url: str,
+        buffer: io.BytesIO,
+        headers: Optional[Dict[str, Any]] = None,
+    ) -> Response:
         buffer.seek(0)
         return self.session.put(url, headers=headers, data=buffer)
 

labelbox-5.0.0/src/labelbox/annotated_types.py

@@ -0,0 +1,6 @@
+from typing_extensions import Annotated
+
+from pydantic import Field
+
+
+Cuid = Annotated[str, Field(min_length=25, max_length=25)]