Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: drop_nulls with subset of length>1 #1090

Merged
merged 2 commits into from
Sep 28, 2024
Merged

fix: drop_nulls with subset of length>1 #1090

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7564a03
fix: drop_nulls with subset
FBruzzesi Sep 28, 2024
0f08dfc
reduce_output_names
FBruzzesi Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion narwhals/_arrow/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def drop_nulls(self: Self, subset: str | list[str] | None) -> Self:
return self._from_native_frame(self._native_frame.drop_null())
subset = [subset] if isinstance(subset, str) else subset
plx = self.__narwhals_namespace__()
return self.filter(~plx.any_horizontal(plx.col(*subset).is_null()))
return self.filter(~plx.any_horizontal(*[plx.col(s).is_null() for s in subset]))

def sort(
self,
Expand Down
12 changes: 3 additions & 9 deletions narwhals/_arrow/namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,7 @@ def all_horizontal(self, *exprs: IntoArrowExpr) -> ArrowExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: ArrowDataFrame) -> list[ArrowSeries]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = (s for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x & y, series)]

return self._create_expr_from_callable(
Expand All @@ -200,9 +198,7 @@ def any_horizontal(self, *exprs: IntoArrowExpr) -> ArrowExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: ArrowDataFrame) -> list[ArrowSeries]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = (s for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x | y, series)]

return self._create_expr_from_callable(
Expand All @@ -217,9 +213,7 @@ def sum_horizontal(self, *exprs: IntoArrowExpr) -> ArrowExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: ArrowDataFrame) -> list[ArrowSeries]:
series = []
for _expr in parsed_exprs:
series.extend([_series.fill_null(0) for _series in _expr._call(df)])
series = (s.fill_null(0) for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x + y, series)]

return self._create_expr_from_callable(
Expand Down
12 changes: 3 additions & 9 deletions narwhals/_dask/namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,7 @@ def all_horizontal(self, *exprs: IntoDaskExpr) -> DaskExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: DaskLazyFrame) -> list[dask_expr.Series]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = [s for _expr in parsed_exprs for s in _expr._call(df)]
return [reduce(lambda x, y: x & y, series).rename(series[0].name)]

return DaskExpr(
Expand All @@ -174,9 +172,7 @@ def any_horizontal(self, *exprs: IntoDaskExpr) -> DaskExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: DaskLazyFrame) -> list[dask_expr.Series]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = [s for _expr in parsed_exprs for s in _expr._call(df)]
return [reduce(lambda x, y: x | y, series).rename(series[0].name)]

return DaskExpr(
Expand All @@ -193,9 +189,7 @@ def sum_horizontal(self, *exprs: IntoDaskExpr) -> DaskExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: DaskLazyFrame) -> list[dask_expr.Series]:
series = []
for _expr in parsed_exprs:
series.extend([_series.fillna(0) for _series in _expr._call(df)])
series = [s.fillna(0) for _expr in parsed_exprs for s in _expr._call(df)]
return [reduce(lambda x, y: x + y, series).rename(series[0].name)]

return DaskExpr(
Expand Down
2 changes: 1 addition & 1 deletion narwhals/_pandas_like/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def drop_nulls(self, subset: str | list[str] | None) -> Self:
return self._from_native_frame(self._native_frame.dropna(axis=0))
subset = [subset] if isinstance(subset, str) else subset
plx = self.__narwhals_namespace__()
return self.filter(~plx.any_horizontal(plx.col(*subset).is_null()))
return self.filter(~plx.any_horizontal(*[plx.col(s).is_null() for s in subset]))

def with_row_index(self, name: str) -> Self:
row_index = create_native_series(
Expand Down
12 changes: 3 additions & 9 deletions narwhals/_pandas_like/namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,7 @@ def sum_horizontal(self, *exprs: IntoPandasLikeExpr) -> PandasLikeExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: PandasLikeDataFrame) -> list[PandasLikeSeries]:
series = []
for _expr in parsed_exprs:
series.extend([_series.fill_null(0) for _series in _expr._call(df)])
series = (s.fill_null(0) for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x + y, series)]

return self._create_expr_from_callable(
Expand All @@ -235,9 +233,7 @@ def all_horizontal(self, *exprs: IntoPandasLikeExpr) -> PandasLikeExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: PandasLikeDataFrame) -> list[PandasLikeSeries]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = (s for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x & y, series)]

return self._create_expr_from_callable(
Expand All @@ -252,9 +248,7 @@ def any_horizontal(self, *exprs: IntoPandasLikeExpr) -> PandasLikeExpr:
parsed_exprs = parse_into_exprs(*exprs, namespace=self)

def func(df: PandasLikeDataFrame) -> list[PandasLikeSeries]:
series = []
for _expr in parsed_exprs:
series.extend(list(_expr._call(df)))
series = (s for _expr in parsed_exprs for s in _expr._call(df))
return [reduce(lambda x, y: x | y, series)]

return self._create_expr_from_callable(
Expand Down
17 changes: 11 additions & 6 deletions tests/frame/drop_nulls_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@ def test_drop_nulls(constructor: Constructor) -> None:
compare_dicts(result, expected)


@pytest.mark.parametrize("subset", ["a", ["a"]])
def test_drop_nulls_subset(constructor: Constructor, subset: str | list[str]) -> None:
@pytest.mark.parametrize(
("subset", "expected"),
[
("a", {"a": [1, 2.0, 4.0], "b": [float("nan"), 3.0, 5.0]}),
(["a"], {"a": [1, 2.0, 4.0], "b": [float("nan"), 3.0, 5.0]}),
(["a", "b"], {"a": [2.0, 4.0], "b": [3.0, 5.0]}),
],
)
def test_drop_nulls_subset(
constructor: Constructor, subset: str | list[str], expected: dict[str, float]
) -> None:
result = nw.from_native(constructor(data)).drop_nulls(subset=subset)
expected = {
"a": [1, 2.0, 4.0],
"b": [float("nan"), 3.0, 5.0],
}
compare_dicts(result, expected)
Loading