Dealing with constr

Author: Val Brodsky

libs/labelbox/src/labelbox/schema/data_row_metadata.py

@@ -5,7 +5,9 @@
 from itertools import chain
 import warnings
 
-from typing import List, Optional, Dict, Union, Callable, Type, Any, Generator, overload
+from typing import List, Optional, Dict, Union, Callable, Type, Any, Generator, overload, Annotated
+
+from pydantic import StringConstraints
 
 from labelbox import pydantic_compat
 from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
@@ -124,17 +126,17 @@ def dict(self, *args, **kwargs):
 
 class _UpsertCustomMetadataSchemaEnumOptionInput(_CamelCaseMixin):
     id: Optional[SchemaId]
-    name: pydantic_compat.constr(strip_whitespace=True,
-                                 min_length=1,
-                                 max_length=100)
+    name: Annotated[
+        str,
+        StringConstraints(strip_whitespace=True, min_length=1, max_length=100)]
     kind: str
 
 
 class _UpsertCustomMetadataSchemaInput(_CamelCaseMixin):
     id: Optional[SchemaId]
-    name: pydantic_compat.constr(strip_whitespace=True,
-                                 min_length=1,
-                                 max_length=100)
+    name: Annotated[
+        str,
+        StringConstraints(strip_whitespace=True, min_length=1, max_length=100)]
     kind: str
     options: Optional[List[_UpsertCustomMetadataSchemaEnumOptionInput]]
 

libs/labelbox/src/labelbox/schema/export_task.py

@@ -23,6 +23,9 @@
 import warnings
 import tempfile
 import os
+
+from pydantic import BaseModel
+
 from labelbox import pydantic_compat
 
 from labelbox.schema.task import Task
@@ -41,19 +44,19 @@ class StreamType(Enum):
     ERRORS = "ERRORS"
 
 
-class Range(_CamelCaseMixin, pydantic_compat.BaseModel):  # pylint: disable=too-few-public-methods
+class Range(_CamelCaseMixin, BaseModel):  # pylint: disable=too-few-public-methods
     """Represents a range."""
 
     start: int
     end: int
 
 
-class _MetadataHeader(_CamelCaseMixin, pydantic_compat.BaseModel):  # pylint: disable=too-few-public-methods
+class _MetadataHeader(_CamelCaseMixin, BaseModel):  # pylint: disable=too-few-public-methods
     total_size: int
     total_lines: int
 
 
-class _MetadataFileInfo(_CamelCaseMixin, pydantic_compat.BaseModel):  # pylint: disable=too-few-public-methods
+class _MetadataFileInfo(_CamelCaseMixin, BaseModel):  # pylint: disable=too-few-public-methods
     offsets: Range
     lines: Range
     file: str
@@ -920,4 +923,3 @@ def get_stream(
     def get_task(client, task_id):
         """Returns the task with the given id."""
         return ExportTask(Task.get_task(client, task_id))
-    

libs/labelbox/src/labelbox/schema/ontology.py

@@ -3,18 +3,21 @@
 import colorsys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union, Type
+from typing import Any, Dict, List, Optional, Union, Type, Annotated
 import warnings
 
+from pydantic import StringConstraints
+
 from labelbox.exceptions import InconsistentOntologyException
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field, Relationship
 from labelbox import pydantic_compat
 import json
 
-FeatureSchemaId: Type[str] = pydantic_compat.constr(min_length=25,
-                                                    max_length=25)
-SchemaId: Type[str] = pydantic_compat.constr(min_length=25, max_length=25)
+FeatureSchemaId: Type[str] = Annotated[
+    str, StringConstraints(min_length=25, max_length=25)]
+SchemaId: Type[str] = Annotated[str,
+                                StringConstraints(min_length=25, max_length=25)]
 
 
 class DeleteFeatureFromOntologyResult: