series_not_empty decorator (#117)

series_not_empty decorator

src/visions/test/series_sparse.py

@@ -26,7 +26,7 @@ def get_sparse_series():
             dtype=pd.SparseDtype(np.bool, False),
         ),
         pd.Series(
-            pd.SparseArray([None, None, "gold", "black", "silver"]),
+            pd.arrays.SparseArray([None, None, "gold", "black", "silver"]),
             name="str_obj_sparse",
         ),
         # Pending https://github.com/pandas-dev/pandas/issues/35762

src/visions/types/boolean.py

@@ -9,7 +9,7 @@
 from visions.types.type import VisionsBaseType
 from visions.utils import func_nullable_series_contains
 from visions.utils.coercion.test_utils import coercion_map, coercion_map_test
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 hasnan_bool_name = "boolean" if int(pd.__version__.split(".")[0]) >= 1 else "Bool"
 
@@ -83,6 +83,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         if not pdt.is_categorical_dtype(series) and pdt.is_bool_dtype(series):
             return True

src/visions/types/categorical.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -30,5 +30,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_categorical_dtype(series)

src/visions/types/complex.py

@@ -7,7 +7,7 @@
 from visions.types.float import string_is_float
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion import test_utils
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def test_imaginary_in_string(
@@ -60,5 +60,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_complex_dtype(series)

src/visions/types/count.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -30,5 +30,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_unsigned_integer_dtype(series)

src/visions/types/date.py

@@ -5,10 +5,11 @@
 
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
+from visions.utils import func_nullable_series_contains
 from visions.utils.series_utils import (
     class_name_attrs,
-    func_nullable_series_contains,
     nullable_series_contains,
+    series_not_empty,
 )
 
 
@@ -53,6 +54,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return class_name_attrs(series, date, ["year", "month", "day"])

src/visions/types/date_time.py

@@ -7,7 +7,7 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion import test_utils
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def string_is_datetime(series: pd.Series, state: dict) -> bool:
@@ -51,5 +51,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_datetime64_any_dtype(series)

src/visions/types/email_address.py

@@ -6,7 +6,11 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion import test_utils
-from visions.utils.series_utils import isinstance_attrs, nullable_series_contains
+from visions.utils.series_utils import (
+    isinstance_attrs,
+    nullable_series_contains,
+    series_not_empty,
+)
 
 
 def string_is_email(series, state: dict):
@@ -73,6 +77,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return isinstance_attrs(series, FQDA, ["local", "fqdn"])

src/visions/types/file.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import nullable_series_contains
+from visions.utils.series_utils import nullable_series_contains, series_not_empty
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -30,6 +30,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return all(isinstance(p, pathlib.Path) and p.exists() for p in series)

src/visions/types/float.py

@@ -7,7 +7,7 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion import test_utils
-from visions.utils.series_utils import func_nullable_series_contains, series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 from visions.utils.warning_handling import suppress_warnings
 
 
@@ -89,6 +89,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @series_not_sparse
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_float_dtype(series)

src/visions/types/geometry.py

@@ -6,7 +6,7 @@
 
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import nullable_series_contains
+from visions.utils.series_utils import nullable_series_contains, series_not_empty
 
 
 def string_is_geometry(series: pd.Series, state: dict) -> bool:
@@ -60,6 +60,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         from shapely.geometry.base import BaseGeometry

src/visions/types/image.py

@@ -6,7 +6,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import nullable_series_contains
+from visions.utils.series_utils import nullable_series_contains, series_not_empty
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -31,6 +31,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return all(

src/visions/types/integer.py

@@ -7,7 +7,7 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils import func_nullable_series_contains
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def to_int(series: pd.Series, state: dict) -> pd.Series:
@@ -53,5 +53,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_integer_dtype(series)

src/visions/types/ip_address.py

@@ -6,7 +6,7 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion import test_utils
-from visions.utils.series_utils import nullable_series_contains
+from visions.utils.series_utils import nullable_series_contains, series_not_empty
 
 
 def string_is_ip(series, state: dict):
@@ -42,6 +42,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return all(isinstance(x, _BaseAddress) for x in series)

src/visions/types/numeric.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -30,5 +30,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_numeric_dtype(series)

src/visions/types/object.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -33,6 +33,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         is_object = pdt.is_object_dtype(series)
         if is_object:

src/visions/types/ordinal.py

@@ -5,6 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
+from visions.utils.series_utils import series_not_empty
 
 
 def to_ordinal(series: pd.Series) -> pd.Categorical:
@@ -34,5 +35,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_categorical_dtype(series) and series.cat.ordered

src/visions/types/path.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import nullable_series_contains
+from visions.utils.series_utils import nullable_series_contains, series_not_empty
 
 
 def string_is_path(series, state: dict) -> bool:
@@ -51,6 +51,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return all(isinstance(x, pathlib.PurePath) and x.is_absolute() for x in series)

src/visions/types/string.py

@@ -6,7 +6,7 @@
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils import func_nullable_series_contains
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 @func_nullable_series_contains
@@ -39,6 +39,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         # TODO: without the object check this passes string categories... is there a better way?
         if pdt.is_categorical_dtype(series):

src/visions/types/time.py

@@ -9,6 +9,7 @@
     class_name_attrs,
     func_nullable_series_contains,
     nullable_series_contains,
+    series_not_empty,
 )
 
 
@@ -44,6 +45,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return class_name_attrs(series, time, ["microsecond", "hour"])

src/visions/types/time_delta.py

@@ -5,7 +5,7 @@
 
 from visions.relations import IdentityRelation, TypeRelation
 from visions.types.type import VisionsBaseType
-from visions.utils.series_utils import series_not_sparse
+from visions.utils.series_utils import series_not_empty, series_not_sparse
 
 
 def _get_relations(cls) -> Sequence[TypeRelation]:
@@ -30,5 +30,6 @@ def get_relations(cls) -> Sequence[TypeRelation]:
 
     @classmethod
     @series_not_sparse
+    @series_not_empty
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return pdt.is_timedelta64_dtype(series)

src/visions/types/type.py

@@ -9,13 +9,6 @@
 
 class VisionsBaseTypeMeta(ABCMeta):
     def __contains__(cls, series: pd.Series, state: dict = {}) -> bool:
-        # Possible alternative:
-        # return cls in cls.typeset.detect_type_path(series)
-
-        if series.empty:
-            from visions.types import Generic
-
-            return issubclass(cls, Generic)
         return cls.contains_op(series, state)  # type: ignore
 
     @property

src/visions/types/url.py

@@ -9,6 +9,7 @@
     func_nullable_series_contains,
     isinstance_attrs,
     nullable_series_contains,
+    series_not_empty,
 )
 
 
@@ -51,6 +52,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return isinstance_attrs(series, ParseResult, ["netloc", "scheme"])

src/visions/types/uuid.py

@@ -6,7 +6,11 @@
 from visions.relations import IdentityRelation, InferenceRelation, TypeRelation
 from visions.types.type import VisionsBaseType
 from visions.utils.coercion.test_utils import coercion_true_test
-from visions.utils.series_utils import isinstance_attrs, nullable_series_contains
+from visions.utils.series_utils import (
+    isinstance_attrs,
+    nullable_series_contains,
+    series_not_empty,
+)
 
 
 def string_is_uuid(series, state: dict) -> bool:
@@ -56,6 +60,7 @@ def get_relations(cls) -> Sequence[TypeRelation]:
         return _get_relations(cls)
 
     @classmethod
+    @series_not_empty
     @nullable_series_contains
     def contains_op(cls, series: pd.Series, state: dict) -> bool:
         return isinstance_attrs(series, uuid.UUID, ["time_low", "hex"])