Skip to content

fix(google-api-core): preserve exact timestamp seconds #18562

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
rioyu123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(google-api-core): preserve exact timestamp seconds #18562

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
2 changes: 1 addition & 1 deletion packages/google-api-core/google/api_core/datetime_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def timestamp_pb(self):
else self.replace(tzinfo=datetime.timezone.utc)
)
delta = inst - _UTC_EPOCH
seconds = int(delta.total_seconds())
seconds = delta.days * 86400 + delta.seconds
nanos = self._nanosecond or self.microsecond * 1000
return timestamp_pb2.Timestamp(seconds=seconds, nanos=nanos)

Expand Down
43 changes: 43 additions & 0 deletions packages/google-api-core/tests/unit/test_datetime_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,49 @@ def test_timestamp_pb_w_nanos():
)
assert stamp.timestamp_pb() == timestamp

@staticmethod
@pytest.mark.parametrize(
"value",
[
"1969-12-31T23:59:59.123456789Z",
"1965-01-02T03:04:05.123456789Z",
"1969-12-31T23:59:59.000000001Z",
"1969-12-31T23:59:59Z",
"1970-01-01T00:00:00.123456789Z",
"2026-10-04T12:34:56.123456789Z",
"9999-12-31T23:59:59.999999999Z",
],
)
def test_timestamp_pb_preserves_whole_seconds(value):
stamp = datetime_helpers.DatetimeWithNanoseconds.from_rfc3339(value)
expected = timestamp_pb2.Timestamp()
expected.FromJsonString(value)

assert stamp.timestamp_pb() == expected

@staticmethod
@pytest.mark.parametrize(
"tzinfo",
[
None,
datetime.timezone.utc,
datetime.timezone(datetime.timedelta(hours=5, minutes=30)),
datetime.timezone(datetime.timedelta(hours=-4)),
],
)
@pytest.mark.parametrize(
"fraction", [{"microsecond": 123456}, {"nanosecond": 123456789}]
)
def test_timestamp_pb_fractional_seconds_with_timezone(tzinfo, fraction):
stamp = datetime_helpers.DatetimeWithNanoseconds(
1969, 12, 31, 23, 59, 59, tzinfo=tzinfo, **fraction
)
expected = timestamp_pb2.Timestamp()
expected.FromDatetime(stamp)
expected.nanos = fraction.get("nanosecond", stamp.microsecond * 1000)

assert stamp.timestamp_pb() == expected

@staticmethod
def test_from_timestamp_pb_wo_nanos():
when = datetime.datetime(
Expand Down
Loading