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

feat: pyarrow automated inference of format %Y%m%d%H%M%S #1326

Merged
merged 8 commits into from
Nov 10, 2024
Merged

feat: pyarrow automated inference of format %Y%m%d%H%M%S #1326

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33dfb5c
wip add '%Y%m%d%H%M%S' pyarrow format
raisadz Nov 4, 2024
466828e
add tests
raisadz Nov 5, 2024
b60f817
rename no sep formats, remove optional sep
raisadz Nov 5, 2024
8cfde51
Merge remote-tracking branch 'upstream/main' into pyarrow-add-format-…
raisadz Nov 5, 2024
c6c6466
add new format to existing tests
raisadz Nov 7, 2024
18e6f6d
change regexpr alias
raisadz Nov 10, 2024
f18b9ae
pin hatchling to get CI green
raisadz Nov 10, 2024
e70b5a2
Revert "pin hatchling to get CI green"
raisadz Nov 10, 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
16 changes: 9 additions & 7 deletions narwhals/_arrow/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,28 +350,28 @@ def convert_str_slice_to_int_slice(


# Regex for date, time, separator and timezone components
DATE_RE = r"(?P<date>\d{1,4}[-/.]\d{1,2}[-/.]\d{1,4})"
DATE_RE = r"(?P<date>\d{1,4}[-/.]\d{1,2}[-/.]\d{1,4}|\d{8})"
SEP_RE = r"(?P<sep>\s|T)"
TIME_RE = r"(?P<time>\d{2}:\d{2}(?::\d{2})?)" # \s*(?P<period>[AP]M)?)?
TIME_RE = r"(?P<time>\d{2}:\d{2}(?::\d{2})?|\d{6}?)" # \s*(?P<period>[AP]M)?)?
HMS_RE = r"^(?P<hms>\d{2}:\d{2}:\d{2})$"
HM_RE = r"^(?P<hm>\d{2}:\d{2})$"
HMS_RE_NO_SEP = r"^(?P<hmsns>\d{6})$"
Copy link
Member

Choose a reason for hiding this comment

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

"ns" reads to me as "nanoseconds" here - maybe we can just write hms_no_sep?

TZ_RE = r"(?P<tz>Z|[+-]\d{2}:?\d{2})" # Matches 'Z', '+02:00', '+0200', '+02', etc.
FULL_RE = rf"{DATE_RE}{SEP_RE}?{TIME_RE}?{TZ_RE}?$"

# Separate regexes for different date formats
YMD_RE = r"^(?P<year>(?:[12][0-9])?[0-9]{2})(?P<sep1>[-/.])(?P<month>0[1-9]|1[0-2])(?P<sep2>[-/.])(?P<day>0[1-9]|[12][0-9]|3[01])$"
DMY_RE = r"^(?P<day>0[1-9]|[12][0-9]|3[01])(?P<sep1>[-/.])(?P<month>0[1-9]|1[0-2])(?P<sep2>[-/.])(?P<year>(?:[12][0-9])?[0-9]{2})$"
MDY_RE = r"^(?P<month>0[1-9]|1[0-2])(?P<sep1>[-/.])(?P<day>0[1-9]|[12][0-9]|3[01])(?P<sep2>[-/.])(?P<year>(?:[12][0-9])?[0-9]{2})$"
YMD_RE_NO_SEP = r"^(?P<year>(?:[12][0-9])?[0-9]{2})(?P<month>0[1-9]|1[0-2])(?P<day>0[1-9]|[12][0-9]|3[01])$"

DATE_FORMATS = (
(YMD_RE_NO_SEP, "%Y%m%d"),
(YMD_RE, "%Y-%m-%d"),
(DMY_RE, "%d-%m-%Y"),
(MDY_RE, "%m-%d-%Y"),
)
TIME_FORMATS = (
(HMS_RE, "%H:%M:%S"),
(HM_RE, "%H:%M"),
)
TIME_FORMATS = ((HMS_RE, "%H:%M:%S"), (HM_RE, "%H:%M"), (HMS_RE_NO_SEP, "%H%M%S"))


def parse_datetime_format(arr: pa.StringArray) -> str:
Expand Down Expand Up @@ -418,7 +418,9 @@ def _parse_date_format(arr: pa.Array) -> str:

for date_rgx, date_fmt in DATE_FORMATS:
matches = pc.extract_regex(arr, pattern=date_rgx)
if (
if date_fmt == "%Y%m%d" and pc.all(matches.is_valid()).as_py():
return date_fmt
elif (
pc.all(matches.is_valid()).as_py()
and pc.count(pc.unique(sep1 := matches.field("sep1"))).as_py() == 1
and pc.count(pc.unique(sep2 := matches.field("sep2"))).as_py() == 1
Expand Down
17 changes: 16 additions & 1 deletion tests/expr_and_series/str/to_datetime_test.py
View file
Open in desktop
EdAbati marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,24 @@ def test_to_datetime_series(constructor_eager: ConstructorEager) -> None:
"2020-01-01 12:34:00",
"2020-01-01T12:34:00.000000000",
),
(
{"a": ["20240101123456"]},
"2024-01-01 12:34:56",
"2024-01-01T12:34:56.000000000",
),
],
)
def test_to_datetime_infer_fmt(
request: pytest.FixtureRequest,
constructor: Constructor,
data: dict[str, list[str]],
expected: str,
expected_cudf: str,
) -> None:
if "polars" in str(constructor) and str(data["a"][0]).isdigit():
request.applymarker(pytest.mark.xfail)
if "cudf" in str(constructor): # pragma: no cover
expected = expected_cudf

result = (
nw.from_native(constructor(data))
.lazy()
Expand All @@ -94,14 +101,22 @@ def test_to_datetime_infer_fmt(
"2020-01-01 12:34:00",
"2020-01-01T12:34:00.000000000",
),
(
{"a": ["20240101123456"]},
"2024-01-01 12:34:56",
"2024-01-01T12:34:56.000000000",
),
],
)
def test_to_datetime_series_infer_fmt(
request: pytest.FixtureRequest,
constructor_eager: ConstructorEager,
data: dict[str, list[str]],
expected: str,
expected_cudf: str,
) -> None:
if "polars" in str(constructor_eager) and str(data["a"][0]).isdigit():
request.applymarker(pytest.mark.xfail)
if "cudf" in str(constructor_eager): # pragma: no cover
expected = expected_cudf

Expand Down
Loading