Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

fix: DataFrameGroupby.agg now works with unnamed tuples #985

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2024
Merged

fix: DataFrameGroupby.agg now works with unnamed tuples #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8f1918
fix: DataFrameGroupby.agg no works with unnamed tuples
TrevorBergeron Sep 13, 2024
8f9f55f
Merge remote-tracking branch 'github/main' into more_groupby
TrevorBergeron Sep 13, 2024
bb2e7cf
add tests for invalid inputs
TrevorBergeron Sep 13, 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
10 changes: 4 additions & 6 deletions 10 bigframes/core/groupby/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,10 @@ def _agg_named(self, **kwargs) -> df.DataFrame:
raise NotImplementedError(
f"Only string aggregate names supported. {constants.FEEDBACK_LINK}"
)
if not hasattr(v, "column") or not hasattr(v, "aggfunc"):
import bigframes.pandas as bpd

raise TypeError(f"kwargs values must be {bpd.NamedAgg.__qualname__}")
col_id = self._resolve_label(v.column)
aggregations.append((col_id, agg_ops.lookup_agg_func(v.aggfunc)))
if not isinstance(v, tuple) or (len(v) != 2):
raise TypeError("kwargs values must be 2-tuples of column, aggfunc")
col_id = self._resolve_label(v[0])
aggregations.append((col_id, agg_ops.lookup_agg_func(v[1])))
column_labels.append(k)
agg_block, _ = self._block.aggregate(
by_column_ids=self._by_col_ids,
Expand Down
35 changes: 35 additions & 0 deletions 35 tests/system/small/test_groupby.py
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could also add test cases for:

  • v is not a tuple
  • v is a tuple but its length is not 2
    ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,41 @@ def test_dataframe_groupby_agg_named(scalars_df_index, scalars_pandas_df_index):
pd.testing.assert_frame_equal(pd_result, bf_result_computed, check_dtype=False)


def test_dataframe_groupby_agg_kw_tuples(scalars_df_index, scalars_pandas_df_index):
col_names = ["int64_too", "float64_col", "int64_col", "bool_col", "string_col"]
bf_result = (
scalars_df_index[col_names]
.groupby("string_col")
.agg(
agg1=("int64_too", "sum"),
agg2=("float64_col", "max"),
)
)
pd_result = (
scalars_pandas_df_index[col_names]
.groupby("string_col")
.agg(agg1=("int64_too", "sum"), agg2=("float64_col", "max"))
)
bf_result_computed = bf_result.to_pandas()

pd.testing.assert_frame_equal(pd_result, bf_result_computed, check_dtype=False)


@pytest.mark.parametrize(
("kwargs"),
[
({"hello": "world"}),
({"too_many_fields": ("one", "two", "three")}),
],
)
def test_dataframe_groupby_agg_kw_error(scalars_df_index, kwargs):
col_names = ["int64_too", "float64_col", "int64_col", "bool_col", "string_col"]
with pytest.raises(
TypeError, match=r"kwargs values must be 2-tuples of column, aggfunc"
):
(scalars_df_index[col_names].groupby("string_col").agg(**kwargs))


@pytest.mark.parametrize(
("as_index"),
[
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.