Cleanup: removed all that I missed

Author: Val Brodsky

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

@@ -1,15 +1,15 @@
 import abc
 from uuid import UUID, uuid4
 from typing import Any, Dict, Optional
-from pydantic import BaseModel
+from pydantic import PrivateAttr
 
 from .feature import FeatureSchema
 
 
 class BaseAnnotation(FeatureSchema, abc.ABC):
     """ Base annotation class. Shouldn't be directly instantiated
     """
-    _uuid: Optional[UUID] = pydantic_compat.PrivateAttr()
+    _uuid: Optional[UUID] = PrivateAttr()
     extra: Dict[str, Any] = {}
 
     def __init__(self, **data):

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

@@ -15,7 +15,7 @@ def create_url(self, signer: Callable[[bytes], str]) -> Optional[str]:
         return self.url
 
     @model_validator(mode='before')
-    @classmethod(pre=True)
+    @classmethod
     def validate_one_datarow_key_present(cls, data):
         keys = ['external_id', 'global_key', 'uid']
         count = sum([key in data for key in keys])

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

@@ -9,7 +9,7 @@
 import requests
 import numpy as np
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, ConfigDict, Extra
 from labelbox.exceptions import InternalServerError
 from .base_data import BaseData
 from ..types import TypedArray
@@ -156,7 +156,7 @@ def create_url(self, signer: Callable[[bytes], str]) -> str:
         return self.url
 
     @model_validator(mode='before')
-    @classmethod()
+    @classmethod
     def validate_args(cls, values):
         file_path = values.get("file_path")
         im_bytes = values.get("im_bytes")
@@ -186,11 +186,7 @@ def __repr__(self) -> str:
                f"url={self.url}," \
                f"arr={symbol_or_none(self.arr)})"
 
-    class Config:
-        # Required for sharing references
-        copy_on_model_validation = 'none'
-        # Required for discriminating between data types
-        extra = 'forbid'
+    model_config = ConfigDict(extra=Extra.forbid,)
 
 
 class MaskData(RasterData):

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

@@ -9,7 +9,7 @@
 from .geometry import Geometry
 from .point import Point
 
-from pydantic import BaseModel
+from pydantic import field_validator
 
 
 class Polygon(Geometry):

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

@@ -4,7 +4,7 @@
 
 from .base import ConfidenceValue, BaseMetric
 
-from pydantic import Field
+from pydantic import Field, field_validator
 
 ScalarMetricValue = Annotated[float, Field(ge=0, le=100_000_000)]
 ScalarMetricConfidenceValue = Dict[ConfidenceValue, ScalarMetricValue]

libs/labelbox/src/labelbox/data/serialization/coco/annotation.py

@@ -10,7 +10,7 @@
 from ...annotation_types.annotation import ObjectAnnotation
 from ...annotation_types.classification.classification import ClassificationAnnotation
 
-from .... import pydantic_compat
+from pydantic import BaseModel
 import numpy as np
 
 from .path import PathSerializerMixin

libs/labelbox/src/labelbox/data/serialization/coco/categories.py

@@ -1,7 +1,7 @@
 import sys
 from hashlib import md5
 
-from .... import pydantic_compat
+from pydantic import BaseModel
 
 
 class Categories(BaseModel):

libs/labelbox/src/labelbox/data/serialization/coco/instance_dataset.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 from tqdm import tqdm
-from .... import pydantic_compat
+from pydantic import BaseModel
 
 from ...annotation_types import ImageData, MaskData, Mask, ObjectAnnotation, Label, Polygon, Point, Rectangle
 from ...annotation_types.collection import LabelCollection

libs/labelbox/src/labelbox/data/serialization/labelbox_v1/feature.py

@@ -28,5 +28,5 @@ def dict(self, *args, **kwargs):
         return res
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
         alias_generator = camel_case

libs/labelbox/src/labelbox/data/serialization/labelbox_v1/label.py

@@ -101,7 +101,7 @@ def from_common(
         return result
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class Review(BaseModel):
@@ -120,13 +120,11 @@ class Config:
 
 class LBV1Label(BaseModel):
     label: Union[LBV1LabelAnnotations,
-                 List[LBV1LabelAnnotationsVideo]] = Field(
-                     ..., alias='Label')
+                 List[LBV1LabelAnnotationsVideo]] = Field(..., alias='Label')
     data_row_id: str = Field(..., alias="DataRow ID")
     row_data: str = Field(None, alias="Labeled Data")
     id: Optional[str] = Field(None, alias='ID')
-    external_id: Optional[str] = Field(None,
-                                                       alias="External ID")
+    external_id: Optional[str] = Field(None, alias="External ID")
     data_row_media_attributes: Optional[Dict[str, Any]] = Field(
         {}, alias="Media Attributes")
     data_row_metadata: Optional[List[Dict[str, Any]]] = Field(
@@ -248,4 +246,4 @@ def _is_url(self) -> bool:
              "s3://")) or "tileLayerUrl" in self.row_data
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True