Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions narwhals/_compliant/group_by.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,19 @@ def _temporary_name(key: str) -> str:
key_str = str(key) # pandas allows non-string column names :sob:
return f"_{key_str}_tmp{'_' * (tmp_name_length - len(key_str) - 5)}"

output_names = _evaluate_aliases(compliant_frame, keys)

keys_aliases = [expr._evaluate_aliases(compliant_frame) for expr in keys]
safe_keys = [
# multi-output expression cannot have duplicate names, hence it's safe to suffix
key.name.map(_temporary_name)
if (metadata := key._metadata) and metadata.expansion_kind.is_multi_output()
# otherwise it's single named and we can use Expr.alias
else key.alias(_temporary_name(new_name))
for key, new_name in zip(keys, output_names)
else key.alias(_temporary_name(new_names[0]))
for key, new_names in zip(keys, keys_aliases)
]
return (
compliant_frame.with_columns(*safe_keys),
_evaluate_aliases(compliant_frame, safe_keys),
output_names,
list(chain.from_iterable(keys_aliases)),
)


Expand Down
13 changes: 9 additions & 4 deletions tests/frame/group_by_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -558,14 +558,19 @@ def test_group_by_raise_drop_null_keys_with_exprs(


def test_group_by_selector(constructor: Constructor) -> None:
data = {"a": [1, 1, 1], "b": [4, 4, 6], "c": [7.5, 8.5, 9.0]}
data = {
"a": [1, 1, 1],
"b": [4, 4, 6],
"c": ["foo", "foo", "bar"],
"x": [7.5, 8.5, 9.0],
}
result = (
nw.from_native(constructor(data))
.group_by(nw.selectors.by_dtype(nw.Int64))
.agg(nw.col("c").mean())
.group_by(nw.selectors.by_dtype(nw.Int64), "c")
.agg(nw.col("x").mean())
.sort("a", "b")
)
expected = {"a": [1, 1], "b": [4, 6], "c": [8.0, 9.0]}
expected = {"a": [1, 1], "b": [4, 6], "c": ["foo", "bar"], "x": [8.0, 9.0]}
assert_equal_data(result, expected)


Expand Down
Loading