Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into SE-1295

Author: Matt Sokoloff

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+# Version 3.11.1 (2022-01-10)
+## Fix
+* Make `TypedArray` class compatible with `numpy` versions `>= 1.22.0`
 
 # Version 3.11.0 (2021-12-15)
 

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "3.11.0"
+__version__ = "3.11.1"
 
 from labelbox.schema.project import Project
 from labelbox.client import Client

labelbox/data/annotation_types/types.py

@@ -1,20 +1,19 @@
 import sys
-import logging
-from typing import Generic, TypeVar
-from typing_extensions import Annotated
+from typing import Generic, TypeVar, Any
 
+from typing_extensions import Annotated
+from packaging import version
 from pydantic import Field
 from pydantic.fields import ModelField
 import numpy as np
 
 Cuid = Annotated[str, Field(min_length=25, max_length=25)]
 
 DType = TypeVar('DType')
-
-logger = logging.getLogger(__name__)
+DShape = TypeVar('DShape')
 
 
-class TypedArray(np.ndarray, Generic[DType]):
+class _TypedArray(np.ndarray, Generic[DType, DShape]):
 
     @classmethod
     def __get_validators__(cls):
@@ -26,12 +25,19 @@ def validate(cls, val, field: ModelField):
             raise TypeError(f"Expected numpy array. Found {type(val)}")
 
         if sys.version_info.minor > 6:
-            actual_dtype = field.sub_fields[0].type_.__args__[0]
+            actual_dtype = field.sub_fields[-1].type_.__args__[0]
         else:
-            actual_dtype = field.sub_fields[0].type_.__values__[0]
+            actual_dtype = field.sub_fields[-1].type_.__values__[0]
 
         if val.dtype != actual_dtype:
             raise TypeError(
                 f"Expected numpy array have type {actual_dtype}. Found {val.dtype}"
             )
         return val
+
+
+if version.parse(np.__version__) >= version.parse('1.22.0'):
+    from numpy.typing import _GenericAlias
+    TypedArray = _GenericAlias(_TypedArray, (Any, DType))
+else:
+    TypedArray = _TypedArray[Any, DType]