Support Field

Author: Val Brodsky

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

@@ -12,7 +12,7 @@
 from PIL import Image
 from pyproj import Transformer
 from pygeotile.point import Point as PygeoPoint
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, field_validator
 
 from labelbox.data.annotation_types import Rectangle, Point, Line, Polygon
 from .base_data import BaseData

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

@@ -2,7 +2,7 @@
 from typing import Any, Callable, Dict, List, Union, Optional
 import warnings
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, field_validator
 
 import labelbox
 from labelbox.data.annotation_types.data.generic_data_row_data import GenericDataRowData

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

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Tuple, Dict, Union
 
-from pydantic import BaseModel
+from pydantic import Field
 
 from .base import ConfidenceValue, BaseMetric
 
@@ -30,5 +30,4 @@ class ConfusionMatrixMetric(BaseMetric):
     metric_name: str
     value: Union[ConfusionMatrixMetricValue,
                  ConfusionMatrixMetricConfidenceValue]
-    aggregation: ConfusionMatrixAggregation = pydantic_compat.Field(
-        ConfusionMatrixAggregation.CONFUSION_MATRIX, const=True)
+    aggregation: ConfusionMatrixAggregation = ConfusionMatrixAggregation.CONFUSION_MATRIX

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

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import List, Optional, Tuple
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, field_validator
 
 from pydantic import BaseModel
 from labelbox.data.annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation

libs/labelbox/src/labelbox/data/mixins.py

@@ -1,6 +1,6 @@
 from typing import Optional, List
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
 from labelbox.exceptions import ConfidenceNotSupportedException, CustomMetricsNotSupportedException
 

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

@@ -2,7 +2,7 @@
 from labelbox.utils import camel_case
 from typing import List, Optional, Union, Dict, Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from ...annotation_types.annotation import (ClassificationAnnotation,
                                             ObjectAnnotation)
@@ -35,7 +35,7 @@ def from_common(
 
 
 class LBV1LabelAnnotationsVideo(LBV1LabelAnnotations):
-    frame_number: int = pydantic_compat.Field(..., alias='frameNumber')
+    frame_number: int = Field(..., alias='frameNumber')
 
     def to_common(
         self
@@ -115,21 +115,21 @@ class Config:
         alias_generator = camel_case
 
 
-Extra = lambda name: pydantic_compat.Field(None, alias=name, extra_field=True)
+Extra = lambda name: Field(None, alias=name, extra_field=True)
 
 
 class LBV1Label(BaseModel):
     label: Union[LBV1LabelAnnotations,
-                 List[LBV1LabelAnnotationsVideo]] = pydantic_compat.Field(
+                 List[LBV1LabelAnnotationsVideo]] = Field(
                      ..., alias='Label')
-    data_row_id: str = pydantic_compat.Field(..., alias="DataRow ID")
-    row_data: str = pydantic_compat.Field(None, alias="Labeled Data")
-    id: Optional[str] = pydantic_compat.Field(None, alias='ID')
-    external_id: Optional[str] = pydantic_compat.Field(None,
+    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")
-    data_row_media_attributes: Optional[Dict[str, Any]] = pydantic_compat.Field(
+    data_row_media_attributes: Optional[Dict[str, Any]] = Field(
         {}, alias="Media Attributes")
-    data_row_metadata: Optional[List[Dict[str, Any]]] = pydantic_compat.Field(
+    data_row_metadata: Optional[List[Dict[str, Any]]] = Field(
         [], alias="DataRow Metadata")
 
     created_by: Optional[str] = Extra('Created By')

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

@@ -4,7 +4,7 @@
 except:
     from typing_extensions import Literal
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 import numpy as np
 
 from .classification import LBV1Checklist, LBV1Classifications, LBV1Radio, LBV1Text, LBV1Dropdown
@@ -66,7 +66,7 @@ class TIRectangleCoordinate(BaseModel):
 
 
 class LBV1TIPoint(LBV1ObjectBase):
-    object_type: Literal['point'] = pydantic_compat.Field(..., alias='type')
+    object_type: Literal['point'] = Field(..., alias='type')
     geometry: TIPointCoordinate
 
     def to_common(self) -> Point:
@@ -75,7 +75,7 @@ def to_common(self) -> Point:
 
 
 class LBV1TILine(LBV1ObjectBase):
-    object_type: Literal['polyline'] = pydantic_compat.Field(..., alias='type')
+    object_type: Literal['polyline'] = Field(..., alias='type')
     geometry: TILineCoordinate
 
     def to_common(self) -> Line:
@@ -85,7 +85,7 @@ def to_common(self) -> Line:
 
 
 class LBV1TIPolygon(LBV1ObjectBase):
-    object_type: Literal['polygon'] = pydantic_compat.Field(..., alias='type')
+    object_type: Literal['polygon'] = Field(..., alias='type')
     geometry: TIPolygonCoordinate
 
     def to_common(self) -> Polygon:
@@ -95,7 +95,7 @@ def to_common(self) -> Polygon:
 
 
 class LBV1TIRectangle(LBV1ObjectBase):
-    object_type: Literal['rectangle'] = pydantic_compat.Field(..., alias='type')
+    object_type: Literal['rectangle'] = Field(..., alias='type')
     geometry: TIRectangleCoordinate
 
     def to_common(self) -> Rectangle:

libs/labelbox/src/labelbox/data/serialization/ndjson/classification.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Union, Optional
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, Field
 from labelbox.data.mixins import ConfidenceMixin, CustomMetric, CustomMetricsMixin
 from labelbox.data.serialization.ndjson.base import DataRow, NDAnnotation
 
@@ -82,7 +82,7 @@ def from_common(cls, text: Text, name: str,
 
 
 class NDChecklistSubclass(NDAnswer):
-    answer: List[NDAnswer] = pydantic_compat.Field(..., alias='answers')
+    answer: List[NDAnswer] = Field(..., alias='answers')
 
     def to_common(self) -> Checklist:
 

libs/labelbox/src/labelbox/schema/bulk_import_request.py

@@ -8,7 +8,7 @@
 from google.api_core import retry
 from labelbox import parser
 import requests
-from pydantic import BaseModel, model_validator, StringConstraints
+from pydantic import BaseModel, model_validator, StringConstraints, Field as PydanticField, field_validator
 from typing_extensions import Literal
 from typing import (Any, List, Optional, BinaryIO, Dict, Iterable, Tuple, Union,
                     Type, Set, TYPE_CHECKING, Annotated)
@@ -716,7 +716,7 @@ def validate_feature_schemas(self, valid_feature_schemas_by_id,
 
 class NDRadio(VideoSupported, NDBase):
     ontology_type: Literal["radio"] = "radio"
-    answer: NDFeatureSchema = pydantic_compat.Field(determinant=True)
+    answer: NDFeatureSchema = PydanticField(determinant=True)
 
     def validate_feature_schemas(self, valid_feature_schemas_by_id,
                                  valid_feature_schemas_by_name):
@@ -780,7 +780,7 @@ def validate_subclasses(cls, value, field):
 
 class NDPolygon(NDBaseTool):
     ontology_type: Literal["polygon"] = "polygon"
-    polygon: List[Point] = pydantic_compat.Field(determinant=True)
+    polygon: List[Point] = PydanticField(determinant=True)
 
     @pydantic_compat.validator('polygon')
     def is_geom_valid(cls, v):
@@ -792,7 +792,7 @@ def is_geom_valid(cls, v):
 
 class NDPolyline(NDBaseTool):
     ontology_type: Literal["line"] = "line"
-    line: List[Point] = pydantic_compat.Field(determinant=True)
+    line: List[Point] = PydanticField(determinant=True)
 
     @pydantic_compat.validator('line')
     def is_geom_valid(cls, v):
@@ -804,13 +804,13 @@ def is_geom_valid(cls, v):
 
 class NDRectangle(NDBaseTool):
     ontology_type: Literal["rectangle"] = "rectangle"
-    bbox: Bbox = pydantic_compat.Field(determinant=True)
+    bbox: Bbox = PydanticField(determinant=True)
     #Could check if points are positive
 
 
 class NDPoint(NDBaseTool):
     ontology_type: Literal["point"] = "point"
-    point: Point = pydantic_compat.Field(determinant=True)
+    point: Point = PydanticField(determinant=True)
     #Could check if points are positive
 
 
@@ -821,7 +821,7 @@ class EntityLocation(BaseModel):
 
 class NDTextEntity(NDBaseTool):
     ontology_type: Literal["named-entity"] = "named-entity"
-    location: EntityLocation = pydantic_compat.Field(determinant=True)
+    location: EntityLocation = PydanticField(determinant=True)
 
     @pydantic_compat.validator('location')
     def is_valid_location(cls, v):
@@ -893,7 +893,7 @@ def validate_color(cls, colorRGB):
 class NDMask(NDBaseTool):
     ontology_type: Literal["superpixel"] = "superpixel"
     mask: Union[URIMaskFeatures, PNGMaskFeatures,
-                RLEMaskFeatures] = pydantic_compat.Field(determinant=True)
+                RLEMaskFeatures] = PydanticField(determinant=True)
 
 
 #A union with custom construction logic to improve error messages