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

fix(postprocessing): resample with holes #27487

Merged
merged 2 commits into from
Mar 14, 2024
Merged

fix(postprocessing): resample with holes #27487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0de088
fix(postprocessing): resample with holes
villebro Mar 13, 2024
da04003
simplify
villebro Mar 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
5 changes: 4 additions & 1 deletion superset/utils/pandas_postprocessing/resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ def resample(
raise InvalidPostProcessingError(_("Resample operation requires DatetimeIndex"))
if method not in RESAMPLE_METHOD:
raise InvalidPostProcessingError(
_("Resample method should in ") + ", ".join(RESAMPLE_METHOD) + "."
_("Resample method should be in ") + ", ".join(RESAMPLE_METHOD) + "."
)

if method == "asfreq" and fill_value is not None:
_df = df.resample(rule).asfreq(fill_value=fill_value)
_df = _df.fillna(fill_value)
elif method == "linear":
_df = df.resample(rule).interpolate()
else:
_df = getattr(df.resample(rule), method)()
if method in ("ffill", "bfill"):
_df = _df.fillna(method=method)
Copy link
Member Author

Choose a reason for hiding this comment

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

Check the docs for using fillna with method: https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.core.resample.Resampler.fillna.html#pandas.core.resample.Resampler.fillna

return _df
54 changes: 53 additions & 1 deletion tests/unit_tests/pandas_postprocessing/test_resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@

from superset.exceptions import InvalidPostProcessingError
from superset.utils import pandas_postprocessing as pp
from tests.unit_tests.fixtures.dataframes import categories_df, timeseries_df
from tests.unit_tests.fixtures.dataframes import (
categories_df,
timeseries_df,
timeseries_with_gap_df,
)


def test_resample_should_not_side_effect():
Expand Down Expand Up @@ -63,6 +67,29 @@ def test_resample():
)


def test_resample_ffill_with_gaps():
post_df = pp.resample(df=timeseries_with_gap_df, rule="1D", method="ffill")
assert post_df.equals(
pd.DataFrame(
index=pd.to_datetime(
[
"2019-01-01",
"2019-01-02",
"2019-01-03",
"2019-01-04",
"2019-01-05",
"2019-01-06",
"2019-01-07",
]
),
data={
"label": ["x", "y", "y", "y", "z", "z", "q"],
"y": [1.0, 2.0, 2.0, 2.0, 2.0, 2.0, 4.0],
},
)
)


def test_resample_zero_fill():
post_df = pp.resample(df=timeseries_df, rule="1D", method="asfreq", fill_value=0)
assert post_df.equals(
Expand All @@ -86,6 +113,31 @@ def test_resample_zero_fill():
)


def test_resample_zero_fill_with_gaps():
post_df = pp.resample(
df=timeseries_with_gap_df, rule="1D", method="asfreq", fill_value=0
)
assert post_df.equals(
pd.DataFrame(
index=pd.to_datetime(
[
"2019-01-01",
"2019-01-02",
"2019-01-03",
"2019-01-04",
"2019-01-05",
"2019-01-06",
"2019-01-07",
]
),
data={
"label": ["x", "y", 0, 0, "z", 0, "q"],
"y": [1.0, 2.0, 0, 0, 0, 0, 4.0],
},
)
)


def test_resample_after_pivot():
df = pd.DataFrame(
data={
Expand Down
Loading