Skip to content

TYP, DOC, CLN:SeriesGroupBy._wrap_applied_output #35120

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

Merged
merged 4 commits into from
Jul 7, 2020
Merged

TYP, DOC, CLN:SeriesGroupBy._wrap_applied_output #35120

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f21c70d
type, document, and simplify _wrap_applied_output
MarcoGorelli Jul 4, 2020
ff88c3a
revert blank line
MarcoGorelli Jul 4, 2020
66eab9b
fix typing
MarcoGorelli Jul 4, 2020
e064486
fix annotation for values
MarcoGorelli Jul 7, 2020
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
30 changes: 22 additions & 8 deletions pandas/core/groupby/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import numpy as np

from pandas._libs import lib
from pandas._typing import FrameOrSeries
from pandas._typing import FrameOrSeries, FrameOrSeriesUnion
from pandas.util._decorators import Appender, Substitution, doc

from pandas.core.dtypes.cast import (
Expand Down Expand Up @@ -413,7 +413,25 @@ def _wrap_transformed_output(
assert isinstance(result, Series)
return result

def _wrap_applied_output(self, keys, values, not_indexed_same=False):
def _wrap_applied_output(
self, keys: Index, values: List[Any], not_indexed_same: bool = False
) -> FrameOrSeriesUnion:
"""
Wrap the output of SeriesGroupBy.apply into the expected result.

Parameters
----------
keys : Index
Keys of groups that Series was grouped by.
values : List[Any]
Applied output for each group.
not_indexed_same : bool, default False
Whether the applied outputs are not indexed the same as the group axes.

Returns
-------
DataFrame or Series
"""
if len(keys) == 0:
# GH #6265
return self.obj._constructor(
Expand All @@ -430,19 +448,15 @@ def _get_index() -> Index:
if isinstance(values[0], dict):
# GH #823 #24880
index = _get_index()
result = self._reindex_output(
result: FrameOrSeriesUnion = self._reindex_output(
self.obj._constructor_expanddim(values, index=index)
)
# if self.observed is False,
# keep all-NaN rows created while re-indexing
result = result.stack(dropna=self.observed)
result.name = self._selection_name
return result

if isinstance(values[0], Series):
return self._concat_objects(keys, values, not_indexed_same=not_indexed_same)
elif isinstance(values[0], DataFrame):
# possible that Series -> DataFrame by applied function
elif isinstance(values[0], (Series, DataFrame)):
return self._concat_objects(keys, values, not_indexed_same=not_indexed_same)
else:
# GH #6265 #24880
Expand Down