dycw-utilities 0.160.0__tar.gz → 0.160.2__tar.gz

{dycw_utilities-0.160.0 → dycw_utilities-0.160.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.160.0
+Version: 0.160.2
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.160.0 → dycw_utilities-0.160.2}/pyproject.toml

@@ -227,7 +227,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.160.0"
+version = "0.160.2"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -259,7 +259,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.160.0"
+current_version = "0.160.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.160.0 → dycw_utilities-0.160.2}/src/tests/test_polars.py

@@ -60,7 +60,6 @@ from pytest import mark, param, raises
 from whenever import DateDelta, DateTimeDelta, PlainDateTime, TimeDelta, ZonedDateTime
 
 import tests.test_math
-import utilities.math
 import utilities.polars
 from utilities.hypothesis import (
     date_deltas,
@@ -180,7 +179,7 @@ from utilities.polars import (
     join_into_periods,
     map_over_columns,
     nan_sum_agg,
-    nan_sum_horizonal,
+    nan_sum_horizontal,
     normal,
     number_of_decimals,
     offset_datetime,
@@ -232,7 +231,6 @@ if TYPE_CHECKING:
 
     from _pytest.mark import ParameterSet
     from polars._typing import IntoExprColumn, PolarsDataType, SchemaDict
-    from polars.datatypes import DataTypeClass
 
     from utilities.types import MaybeType, StrMapping, WeekDay
 
@@ -2156,36 +2154,27 @@ class TestMapOverColumns:
 
 
 class TestNanSumAgg:
-    @given(
-        case=sampled_from([
-            ([None], None),
-            ([None, None], None),
-            ([0], 0),
-            ([0, None], 0),
-            ([0, None, None], 0),
-            ([1, 2], 3),
-            ([1, 2, None], 3),
-            ([1, 2, None, None], 3),
-        ]),
-        dtype=sampled_from([Int64, Float64]),
-        mode=sampled_from(["str", "column"]),
+    @mark.parametrize(
+        ("values", "expected"),
+        [
+            param([None], None),
+            param([None, None], None),
+            param([0], 0),
+            param([0, None], 0),
+            param([0, None, None], 0),
+            param([1, 2], 3),
+            param([1, 2, None], 3),
+            param([1, 2, None, None], 3),
+        ],
     )
-    def test_main(
-        self,
-        *,
-        case: tuple[list[Any], int | None],
-        dtype: DataTypeClass,
-        mode: Literal["str", "column"],
-    ) -> None:
-        values, expected = case
-        df = DataFrame(data=values, schema={"value": dtype}).with_columns(id=lit("id"))
-        match mode:
-            case "str":
-                agg = "value"
-            case "column":
-                agg = col("value")
-        result = df.group_by("id").agg(nan_sum_agg(agg))
-        assert result["value"].item() == expected
+    def test_main(self, *, values: list[int | None], expected: int | None) -> None:
+        df = (
+            Series(name="x", values=values, dtype=Int64)
+            .to_frame()
+            .with_columns(id=lit("id"))
+        )
+        result = df.group_by("id").agg(nan_sum_agg("x"))
+        assert result.item(0, "x") == expected
 
 
 class TestNanSumHorizontal:
@@ -2202,7 +2191,7 @@ class TestNanSumHorizontal:
         self, *, x: int | None, y: int | None, z: int | None, expected: int | None
     ) -> None:
         series = [Series(values=[i], dtype=Int64) for i in [x, y, z]]
-        result = nan_sum_horizonal(*series)
+        result = nan_sum_horizontal(*series)
         assert result.item() == expected
 
 

{dycw_utilities-0.160.0 → dycw_utilities-0.160.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.160.0"
+__version__ = "0.160.2"

{dycw_utilities-0.160.0 → dycw_utilities-0.160.2}/src/utilities/polars.py

@@ -1906,24 +1906,20 @@ def _map_over_series_one(func: Callable[[Series], Series], series: Series, /) ->
 ##
 
 
-def nan_sum_agg(column: str | Expr, /, *, dtype: PolarsDataType | None = None) -> Expr:
+def nan_sum_agg(column: str | Expr, /) -> Expr:
     """Nan sum aggregation."""
     col_use = col(column) if isinstance(column, str) else column
-    return (
-        when(col_use.is_not_null().any())
-        .then(col_use.sum())
-        .otherwise(lit(None, dtype=dtype))
-    )
+    return when(col_use.is_not_null().any()).then(col_use.sum())
 
 
 ##
 
 
 @overload
-def nan_sum_horizonal(*columns: Series) -> Series: ...
+def nan_sum_horizontal(*columns: Series) -> Series: ...
 @overload
-def nan_sum_horizonal(*columns: IntoExprColumn) -> ExprOrSeries: ...
-def nan_sum_horizonal(*columns: IntoExprColumn) -> ExprOrSeries:
+def nan_sum_horizontal(*columns: IntoExprColumn) -> ExprOrSeries: ...
+def nan_sum_horizontal(*columns: IntoExprColumn) -> ExprOrSeries:
     """Nan sum across columns."""
     columns2 = ensure_expr_or_series_many(*columns)
     expr = when(any_horizontal(*(c.is_not_null() for c in columns2))).then(
@@ -2702,7 +2698,7 @@ __all__ = [
     "join_into_periods",
     "map_over_columns",
     "nan_sum_agg",
-    "nan_sum_horizonal",
+    "nan_sum_horizontal",
     "normal",
     "number_of_decimals",
     "offset_datetime",