Skip to content

CLN: Simplify gathering of results in aggregate #37227

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.

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

Merged
merged 3 commits into from
Oct 22, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
48 changes: 11 additions & 37 deletions pandas/core/aggregation.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,37 +622,17 @@ def aggregate(obj, arg: AggFuncType, *args, **kwargs):
keys = list(arg.keys())

# combine results
from pandas.core.generic import NDFrame

def is_any_series() -> bool:
# return a boolean if we have *any* nested series
return any(isinstance(r, ABCSeries) for r in results.values())

def is_any_frame() -> bool:
# return a boolean if we have *any* nested series
return any(isinstance(r, ABCDataFrame) for r in results.values())

if isinstance(results, list):
return concat(results, keys=keys, axis=1, sort=True), True

elif is_any_frame():
# we have a dict of DataFrames
# return a MI DataFrame

keys_to_use = [k for k in keys if not results[k].empty]
# Have to check, if at least one DataFrame is not empty.
keys_to_use = keys_to_use if keys_to_use != [] else keys
return (
concat([results[k] for k in keys_to_use], keys=keys_to_use, axis=1),
True,
)

elif isinstance(obj, ABCSeries) and is_any_series():

# we have a dict of Series
# return a MI Series
if any(isinstance(r, NDFrame) for r in results.values()):
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add a ABCNDFrame in pandas.core.dtypes.generic

try:
result = concat(results)
except TypeError as err:
keys_to_use = [k for k in keys if not results[k].empty]
Copy link
Contributor

Choose a reason for hiding this comment

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

where does the AttributeError come from?

can you move things outside the try/except (or use an else)?

# Have to check, if at least one DataFrame is not empty.
keys_to_use = keys_to_use if keys_to_use != [] else keys
axis = 0 if isinstance(obj, ABCSeries) else 1
result = concat({k: results[k] for k in keys_to_use}, axis=axis)
# Raised if some value of results is not a NDFrame
Copy link
Contributor

Choose a reason for hiding this comment

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

can you move this comment below the AttributeError (as confusing where it is now)

except AttributeError as err:
# we want to give a nice error here if
# we have non-same sized objects, so
# we don't automatically broadcast
Expand All @@ -663,16 +643,10 @@ def is_any_frame() -> bool:
"simultaneously"
) from err

return result, True

# fall thru
from pandas import DataFrame, Series
else:
from pandas import Series

try:
result = DataFrame(results)
except ValueError:
# we have a dict of scalars

# GH 36212 use name only if obj is a series
if obj.ndim == 1:
obj = cast("Series", obj)
Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/frame/apply/test_frame_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ def test_agg_reduce(self, axis, float_frame):
# dict input with lists with multiple
func = dict([(name1, ["mean", "sum"]), (name2, ["sum", "max"])])
result = float_frame.agg(func, axis=axis)
expected = DataFrame(
expected = pd.concat(
dict(
[
(
Expand All @@ -1278,7 +1278,8 @@ def test_agg_reduce(self, axis, float_frame):
),
),
]
)
),
axis=1,
)
expected = expected.T if axis in {1, "columns"} else expected
tm.assert_frame_equal(result, expected)
Expand Down