Convert field validator

Author: Val Brodsky

libs/labelbox/src/labelbox/data/annotation_types/data/tiled_image.py

@@ -54,7 +54,8 @@ class TiledBounds(BaseModel):
     epsg: EPSG
     bounds: List[Point]
 
-    @pydantic_compat.validator('bounds')
+    @field_validator('bounds')
+    @classmethod
     def validate_bounds_not_equal(cls, bounds):
         first_bound = bounds[0]
         second_bound = bounds[1]
@@ -99,7 +100,8 @@ class TileLayer(BaseModel):
     def asdict(self) -> Dict[str, str]:
         return {"tileLayerUrl": self.url, "name": self.name}
 
-    @pydantic_compat.validator('url')
+    @field_validator('url')
+    @classmethod
     def validate_url(cls, url):
         xyz_format = "/{z}/{x}/{y}"
         if xyz_format not in url:
@@ -344,7 +346,8 @@ def _validate_num_tiles(self, xstart: float, ystart: float, xend: float,
                              f"Max allowed tiles are {max_tiles}"
                              f"Increase max tiles or reduce zoom level.")
 
-    @pydantic_compat.validator('zoom_levels')
+    @field_validator('zoom_levels')
+    @classmethod
     def validate_zoom_levels(cls, zoom_levels):
         if zoom_levels[0] > zoom_levels[1]:
             raise ValueError(

libs/labelbox/src/labelbox/data/annotation_types/data/video.py

@@ -12,7 +12,7 @@
 from .base_data import BaseData
 from ..types import TypedArray
 
-from pydantic import BaseModel, model_validator
+from pydantic import model_validator, field_validator
 
 logger = logging.getLogger(__name__)
 

libs/labelbox/src/labelbox/data/annotation_types/geometry/line.py

@@ -9,7 +9,7 @@
 from .point import Point
 from .geometry import Geometry
 
-from pydantic import BaseModel
+from pydantic import field_validator
 
 
 class Line(Geometry):
@@ -65,7 +65,8 @@ def draw(self,
                              color=color,
                              thickness=thickness)
 
-    @pydantic_compat.validator('points')
+    @field_validator('points')
+    @classmethod
     def is_geom_valid(cls, points):
         if len(points) < 2:
             raise ValueError(

libs/labelbox/src/labelbox/data/annotation_types/geometry/mask.py

@@ -8,7 +8,7 @@
 from ..data import MaskData
 from .geometry import Geometry
 
-from pydantic import BaseModel
+from pydantic import field_validator
 
 
 class Mask(Geometry):
@@ -122,7 +122,8 @@ def create_url(self, signer: Callable[[bytes], str]) -> str:
         """
         return self.mask.create_url(signer)
 
-    @pydantic_compat.validator('color')
+    @field_validator('color')
+    @classmethod
     def is_valid_color(cls, color):
         if isinstance(color, (tuple, list)):
             if len(color) == 1:

libs/labelbox/src/labelbox/data/annotation_types/geometry/polygon.py

@@ -68,7 +68,8 @@ def draw(self,
             return cv2.fillPoly(canvas, pts, color)
         return cv2.polylines(canvas, pts, True, color, thickness)
 
-    @pydantic_compat.validator('points')
+    @field_validator('points')
+    @classmethod
     def is_geom_valid(cls, points):
         if len(points) < 3:
             raise ValueError(

libs/labelbox/src/labelbox/data/annotation_types/label.py

@@ -202,11 +202,11 @@ def _assign_option(self, classification: ClassificationAnnotation,
                 f"Unexpected type for answer found. {type(classification.value.answer)}"
             )
 
-    @pydantic_compat.validator("annotations", pre=True)
+    @field_validator("annotations", mode='before')
     def validate_union(cls, value):
         supported = tuple([
-            field.type_
-            for field in cls.__fields__['annotations'].sub_fields[0].sub_fields
+            field.type_ for field in
+            cls.__model_fields__['annotations'].sub_fields[0].sub_fields
         ])
         if not isinstance(value, list):
             raise TypeError(f"Annotations must be a list. Found {type(value)}")

libs/labelbox/src/labelbox/data/annotation_types/metrics/base.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Dict, Optional, Any, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
 ConfidenceValue = pydantic_compat.confloat(ge=0, le=1)
 
@@ -19,7 +19,8 @@ def dict(self, *args, **kwargs):
         res = super().dict(*args, **kwargs)
         return {k: v for k, v in res.items() if v is not None}
 
-    @pydantic_compat.validator('value')
+    @field_validator('value')
+    @classmethod
     def validate_value(cls, value):
         if isinstance(value, Dict):
             if not (MIN_CONFIDENCE_SCORES <= len(value) <=

libs/labelbox/src/labelbox/data/annotation_types/metrics/scalar.py

@@ -1,3 +1,4 @@
+from dataclasses import field
 from typing import Dict, Optional, Union
 from enum import Enum
 
@@ -33,7 +34,8 @@ class ScalarMetric(BaseMetric):
     value: Union[ScalarMetricValue, ScalarMetricConfidenceValue]
     aggregation: ScalarMetricAggregation = ScalarMetricAggregation.ARITHMETIC_MEAN
 
-    @pydantic_compat.validator('metric_name')
+    @field_validator('metric_name')
+    @classmethod
     def validate_metric_name(cls, name: Union[str, None]):
         if name is None:
             return None

libs/labelbox/src/labelbox/data/annotation_types/ner/document_entity.py

@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 from labelbox.utils import _CamelCaseMixin
 
 
@@ -11,7 +11,8 @@ class DocumentTextSelection(_CamelCaseMixin, BaseModel):
     group_id: str
     page: int
 
-    @pydantic_compat.validator("page")
+    @field_validator("page")
+    @classmethod
     def validate_page(cls, v):
         if v < 1:
             raise ValueError("Page must be greater than 1")

libs/labelbox/src/labelbox/data/annotation_types/video.py

@@ -104,7 +104,8 @@ def validate_args(cls, values):
             raise ValueError("One of `instance_uri`, `im_bytes` required.")
         return values
 
-    @pydantic_compat.validator("instance_uri")
+    @field_validator("instance_uri")
+    @classmethod
     def validate_uri(cls, v):
         if not is_valid_uri(v):
             raise ValueError(f"{v} is not a valid uri")