refactor: update custom validator definition

t4_devkit/schema/tables/autolabel_metadata.py

@@ -18,15 +18,12 @@ class AutolabelModel:
 
     name: str = field(validator=validators.instance_of(str))
     score: float = field(
-        validator=[
-            validators.instance_of(float),
-            validators.and_(validators.ge(0.0), validators.le(1.0)),
-        ]
+        validator=(validators.instance_of(float), validators.ge(0.0), validators.le(1.0))
     )
     uncertainty: float | None = field(
         default=None,
         validator=validators.optional(
-            (validators.instance_of(float), validators.and_(validators.ge(0.0), validators.le(1.0)))
+            validators.and_(validators.instance_of(float), validators.ge(0.0), validators.le(1.0))
         ),
     )
 

t4_devkit/schema/tables/base.py

@@ -11,17 +11,23 @@
 __all__ = ["SchemaBase", "SchemaTable"]
 
 
-def impossible_empty(instance, attribute, value: Sized) -> None:
-    """A validator that raises ValueError if value is empty."""
-    if len(value) == 0:
-        raise ValueError(f"{attribute.name} cannot be empty")
+def impossible_empty():
+    """Factory function that returns a validator instance which raises ValueError if value is empty."""
+    return _ImpossibleEmptyValidator()
+
+
+@define(slots=True, unsafe_hash=True)
+class _ImpossibleEmptyValidator:
+    def __call__(self, instance, attribute, value: Sized) -> None:
+        if len(value) == 0:
+            raise ValueError(f"{attribute.name} cannot be empty")
 
 
 @define
 class SchemaBase(ABC):
     """Abstract base dataclass of schema tables."""
 
-    token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    token: str = field(validator=(validators.instance_of(str), impossible_empty()))
 
     @classmethod
     def from_json(cls, filepath: str) -> list[SchemaTable]:

t4_devkit/schema/tables/calibrated_sensor.py

@@ -26,7 +26,7 @@ class CalibratedSensor(SchemaBase):
         camera_distortion (CameraDistortion): Camera distortion array. Empty for sensors that are not cameras.
     """
 
-    sensor_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sensor_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     translation: Vector3 = field(converter=Vector3)
     rotation: Quaternion = field(converter=to_quaternion)
     camera_intrinsic: CameraIntrinsic = field(converter=CameraIntrinsic)

t4_devkit/schema/tables/instance.py

@@ -25,7 +25,7 @@ class Instance(SchemaBase):
             Empty if the dataset only contains 2D annotations.
     """
 
-    category_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    category_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     instance_name: str = field(validator=validators.instance_of(str))
     nbr_annotations: int = field(validator=validators.instance_of(int))
     first_annotation_token: str = field(validator=validators.instance_of(str))

t4_devkit/schema/tables/keypoint.py

@@ -29,10 +29,10 @@ class Keypoint(SchemaBase):
         num_keypoints (int): The number of keypoints to be annotated.
     """
 
-    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     category_tokens: list[str] = field(
-        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty))
+        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty()))
     )
     keypoints: KeypointLike = field(converter=np.array)
     num_keypoints: int = field(validator=validators.instance_of(int))

t4_devkit/schema/tables/lidarseg.py

@@ -21,4 +21,4 @@ class LidarSeg(SchemaBase):
     """
 
     filename: str = field(validator=validators.instance_of(str))
-    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty()))

t4_devkit/schema/tables/map.py

@@ -22,7 +22,7 @@ class Map(SchemaBase):
     """
 
     log_tokens: list[str] = field(
-        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty))
+        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty()))
     )
     category: str = field(validator=validators.instance_of(str))
     filename: str = field(validator=validators.instance_of(str))

t4_devkit/schema/tables/object_ann.py

@@ -76,11 +76,11 @@ class ObjectAnn(SchemaBase, AutolabelMixin):
         category_name (str): Category name. This should be set after instantiated.
     """
 
-    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    category_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    category_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     attribute_tokens: list[str] = field(
-        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty))
+        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty()))
     )
     bbox: Roi = field(converter=Roi)
     mask: RLEMask | None = field(

t4_devkit/schema/tables/sample.py

@@ -34,7 +34,7 @@ class Sample(SchemaBase):
     """
 
     timestamp: int = field(validator=validators.instance_of(int))
-    scene_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    scene_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     next: str = field(validator=validators.instance_of(str))
     prev: str = field(validator=validators.instance_of(str))
 

t4_devkit/schema/tables/sample_annotation.py

@@ -48,12 +48,12 @@ class SampleAnnotation(SchemaBase, AutolabelMixin):
         category_name (str): Category name. This should be set after instantiated.
     """
 
-    sample_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sample_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    instance_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     attribute_tokens: list[str] = field(
-        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty))
+        validator=validators.deep_iterable((validators.instance_of(str), impossible_empty()))
     )
-    visibility_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    visibility_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     translation: Vector3 = field(converter=Vector3)
     size: Vector3 = field(converter=Vector3)
     rotation: Quaternion = field(converter=to_quaternion)

t4_devkit/schema/tables/sample_data.py

@@ -95,8 +95,10 @@ class SampleData(SchemaBase):
     """
 
     sample_token: str = field(validator=validators.instance_of(str))
-    ego_pose_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    calibrated_sensor_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    ego_pose_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    calibrated_sensor_token: str = field(
+        validator=(validators.instance_of(str), impossible_empty())
+    )
     filename: str = field(validator=validators.instance_of(str))
     fileformat: FileFormat = field(converter=FileFormat)
     width: int = field(validator=validators.instance_of(int))

t4_devkit/schema/tables/scene.py

@@ -26,7 +26,7 @@ class Scene(SchemaBase):
 
     name: str = field(validator=validators.instance_of(str))
     description: str = field(validator=validators.instance_of(str))
-    log_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    log_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     nbr_samples: int = field(validator=validators.instance_of(int))
-    first_sample_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    last_sample_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    first_sample_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    last_sample_token: str = field(validator=(validators.instance_of(str), impossible_empty()))

t4_devkit/schema/tables/surface_ann.py

@@ -35,8 +35,8 @@ class SurfaceAnn(SchemaBase, AutolabelMixin):
         category_name (str): Category name. This should be set after instantiated.
     """
 
-    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty))
-    category_token: str = field(validator=(validators.instance_of(str), impossible_empty))
+    sample_data_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
+    category_token: str = field(validator=(validators.instance_of(str), impossible_empty()))
     mask: RLEMask | None = field(
         default=None,
         converter=lambda x: RLEMask(**x) if isinstance(x, dict) else x,