Skip to content

fix(sensor): parse ISO timestamps with any fractional-second precision #198

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

Open
rudycelekli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sensor): parse ISO timestamps with any fractional-second precision #198

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
10 changes: 10 additions & 0 deletions Sensor/adr_sensor/utils/timestamp_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@
Timestamp utilities for standardized datetime handling across parsers.
"""

import re
from datetime import datetime, timezone
from typing import Optional, Union

# Python < 3.11 fromisoformat() only accepts 3 or 6 fractional-second digits,
# but RFC 3339 writers (e.g. Go's RFC3339Nano) emit anywhere from 1 to 9.
_FRACTIONAL_SECONDS = re.compile(r"(?<=:\d\d)\.(\d+)")


def _fraction_to_microseconds(match: "re.Match[str]") -> str:
return "." + (match.group(1) + "000000")[:6]


def normalize_timestamp(timestamp: Union[str, int, float, datetime]) -> datetime:
"""Convert any timestamp format to a timezone-aware datetime in UTC.
Expand All @@ -28,6 +37,7 @@ def normalize_timestamp(timestamp: Union[str, int, float, datetime]) -> datetime
elif isinstance(timestamp, str):
try:
iso_str = timestamp.replace("Z", "+00:00")
iso_str = _FRACTIONAL_SECONDS.sub(_fraction_to_microseconds, iso_str, count=1)
dt = datetime.fromisoformat(iso_str)
except ValueError:
try:
Expand Down
16 changes: 16 additions & 0 deletions Sensor/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ def test_float_timestamp(self):
dt = normalize_timestamp(1704067200.5)
assert dt.year == 2024

@pytest.mark.parametrize(
("value", "microsecond"),
[
("2025-07-16T13:32:09.5Z", 500000),
("2025-07-16T13:32:09.12345Z", 123450),
("2025-07-16T13:32:09.123456789Z", 123456),
("2025-07-16T13:32:09.123456789-07:00", 123456),
("2025-07-16 13:32:09.1234567", 123456),
],
)
def test_iso_string_with_any_fraction_length(self, value, microsecond):
# Python < 3.11 fromisoformat() only accepts 3 or 6 fractional digits.
dt = normalize_timestamp(value)
assert dt.tzinfo == timezone.utc
assert (dt.minute, dt.second, dt.microsecond) == (32, 9, microsecond)


class TestFormatTimestampForFilename:
def test_format(self):
Expand Down