Start BaseModel conversion to v2

Author: Val Brodsky

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

@@ -1,6 +1,8 @@
 from enum import Enum
 from typing import List, Optional, Tuple
 
+from pydantic import BaseModel, model_validator
+
 from labelbox import pydantic_compat
 from labelbox.data.annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation
 
@@ -87,12 +89,13 @@ class DICOMObjectAnnotation(VideoObjectAnnotation):
     group_key: GroupKey
 
 
-class MaskFrame(_CamelCaseMixin, pydantic_compat.BaseModel):
+class MaskFrame(_CamelCaseMixin, BaseModel):
     index: int
     instance_uri: Optional[str] = None
     im_bytes: Optional[bytes] = None
 
-    @pydantic_compat.root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_args(cls, values):
         im_bytes = values.get("im_bytes")
         instance_uri = values.get("instance_uri")
@@ -101,11 +104,11 @@ def validate_args(cls, values):
             raise ValueError("One of `instance_uri`, `im_bytes` required.")
         return values
 
-    @pydantic_compat.validator("instance_uri")
-    def validate_uri(cls, v):
-        if not is_valid_uri(v):
-            raise ValueError(f"{v} is not a valid uri")
-        return v
+    # @pydantic_compat.validator("instance_uri")
+    # def validate_uri(cls, v):
+    #     if not is_valid_uri(v):
+    #         raise ValueError(f"{v} is not a valid uri")
+    #     return v
 
 
 class MaskInstance(_CamelCaseMixin, FeatureSchema):

libs/labelbox/src/labelbox/utils.py

@@ -6,6 +6,9 @@
 from dateutil.utils import default_tzinfo
 
 from urllib.parse import urlparse
+
+from pydantic import BaseModel
+
 from labelbox import pydantic_compat
 
 UPPERCASE_COMPONENTS = ['uri', 'rgb']
@@ -51,10 +54,10 @@ def is_valid_uri(uri):
         return False
 
 
-class _CamelCaseMixin(pydantic_compat.BaseModel):
+class _CamelCaseMixin(BaseModel):
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
         alias_generator = camel_case