Fix pydantic_compat

Author: Val Brodsky

labelbox/data/annotation_types/classification/classification.py

@@ -9,7 +9,7 @@
 except:
     from typing_extensions import Literal
 
-from labelbox import pydantic_compat, validator
+from labelbox import pydantic_compat
 from ..feature import FeatureSchema
 
 

labelbox/data/annotation_types/label.py

@@ -2,7 +2,7 @@
 from typing import Any, Callable, Dict, List, Union, Optional
 import warnings
 
-from labelbox import pydantic_compat, validator
+from labelbox import pydantic_compat
 
 import labelbox
 from labelbox.data.annotation_types.data.tiled_image import TiledImageData
@@ -189,7 +189,7 @@ def _assign_option(self, classification: ClassificationAnnotation,
                 f"Unexpected type for answer found. {type(classification.value.answer)}"
             )
 
-    @validator("annotations", pre=True)
+    @pydantic_compat.validator("annotations", pre=True)
     def validate_union(cls, value):
         supported = tuple([
             field.type_

labelbox/data/annotation_types/video.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import List, Optional, Tuple
 
-from labelbox import pydantic_compat, validator, root_validator
+from labelbox import pydantic_compat
 from labelbox.data.annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation
 
 from labelbox.data.annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation
@@ -92,7 +92,7 @@ class MaskFrame(_CamelCaseMixin, pydantic_compat.BaseModel):
     instance_uri: Optional[str] = None
     im_bytes: Optional[bytes] = None
 
-    @root_validator()
+    @pydantic_compat.root_validator()
     def validate_args(cls, values):
         im_bytes = values.get("im_bytes")
         instance_uri = values.get("instance_uri")
@@ -101,7 +101,7 @@ def validate_args(cls, values):
             raise ValueError("One of `instance_uri`, `im_bytes` required.")
         return values
 
-    @validator("instance_uri")
+    @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")

labelbox/pydantic_compat.py

@@ -11,7 +11,6 @@ def pydantic_import(class_name, sub_module_path: Optional[str] = None):
     # Check if the version is 1
     if pydantic_version.startswith("1"):
         pydantic_v1_module_name = "pydantic" if sub_module_path is None else f"pydantic.{sub_module_path}"
-        klass = getattr(importlib.import_module("pydantic"), class_name)
     else:  # use pydantic 2 v1 thunk
         pydantic_v1_module_name = "pydantic.v1" if sub_module_path is None else f"pydantic.{sub_module_path}"