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

Jump to bottom

fix(rust, python): make 'truncate' tz-aware #5522

Merged
merged 1 commit into from
Nov 16, 2022
Merged

fix(rust, python): make 'truncate' tz-aware #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions polars/polars-lazy/polars-plan/src/dsl/function_expr/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ pub(super) fn cast_timezone(s: &Series, tz: &str) -> PolarsResult<Series> {
pub(super) fn tz_localize(s: &Series, tz: &str) -> PolarsResult<Series> {
let ca = s.datetime()?.clone();
match ca.time_zone() {
Some(tz) if tz == "UTC" => {
Ok(ca.with_time_zone(Some("UTC".into())).into_series())
}
Some(tz) if !tz.is_empty() => {
Err(PolarsError::ComputeError("Cannot localize a tz-aware datetime. Consider using 'dt.with_time_zone' or 'dt.cast_time_zone'".into()))
},
Expand Down
7 changes: 7 additions & 0 deletions polars/polars-time/src/chunkedarray/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ pub trait DatetimeMethods: AsDatetime {
.into_datetime(tu, None)
}

#[cfg(feature = "timezones")]
fn apply_tz_offset(&self, tz: &str) -> PolarsResult<DatetimeChunked> {
let ca = self.as_datetime();
let keep_tz = ca.time_zone().clone();
Ok(self.cast_time_zone(tz)?.with_time_zone(keep_tz))
}

#[cfg(feature = "timezones")]
fn cast_time_zone(&self, tz: &str) -> PolarsResult<DatetimeChunked> {
use chrono_tz::Tz;
Expand Down
18 changes: 16 additions & 2 deletions polars/polars-time/src/truncate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,22 @@ impl PolarsTruncate for DatetimeChunked {
TimeUnit::Milliseconds => Window::truncate_ms,
};

self.apply(|t| func(&w, t))
.into_datetime(self.time_unit(), self.time_zone().clone())
let out = self
.apply(|t| func(&w, t))
.into_datetime(self.time_unit(), self.time_zone().clone());

if self.time_zone().is_some() {
#[cfg(feature = "timezones")]
{
out.apply_tz_offset("UTC").unwrap()
}
#[cfg(not(feature = "timezones"))]
{
panic!("activate 'timezones' feature")
}
} else {
out
}
}
}

Expand Down
60 changes: 60 additions & 0 deletions py-polars/tests/unit/test_datelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,3 +1856,63 @@ def test_tz_localize() -> None:
),
]
}


def test_tz_aware_truncate() -> None:
test = pl.DataFrame(
{
"dt": pl.date_range(
low=datetime(2022, 11, 1), high=datetime(2022, 11, 4), interval="12h"
).dt.tz_localize("America/New_York")
}
)
assert test.with_column(pl.col("dt").dt.truncate("1d").alias("trunced")).to_dict(
False
) == {
"dt": [
datetime(
2022, 11, 1, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 1, 12, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 2, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 2, 12, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 3, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 3, 12, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 4, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
],
"trunced": [
datetime(
2022, 11, 1, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 1, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 2, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 2, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 3, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 3, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
datetime(
2022, 11, 4, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="America/New_York")
),
],
}