Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions task-sdk/src/airflow/sdk/serde/serializers/timezone.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,12 @@ def serialize(o: object) -> tuple[U, str, int, bool]:
if tz_name is not None:
return tz_name, name, __version__, True

if cast("datetime.tzinfo", o).utcoffset(None) == datetime.timedelta(0):
return "UTC", qualname(FixedTimezone), __version__, True
offset = cast("datetime.tzinfo", o).utcoffset(None)
if offset is not None:
seconds = int(offset.total_seconds())
if seconds == 0:
return "UTC", qualname(FixedTimezone), __version__, True
return seconds, qualname(FixedTimezone), __version__, True

return "", "", 0, False

Expand Down
17 changes: 14 additions & 3 deletions task-sdk/tests/task_sdk/serde/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def tzname(self, dt: datetime.datetime | None) -> str | None:

class NoNameTZ(datetime.tzinfo):
def utcoffset(self, dt):
return datetime.timedelta(hours=2)
return None


class FooBarModel(BaseModel):
Expand Down Expand Up @@ -107,16 +107,21 @@ class TestSerializers:
pytest.param(DateTime(2022, 7, 10, tzinfo=tzutc()), id="datetime_tzutc"),
pytest.param(DateTime(2022, 7, 10, tzinfo=ZoneInfo("Europe/Paris")), id="datetime_zoneinfo"),
pytest.param(datetime.datetime.now(), id="datetime_now"),
pytest.param(
datetime.datetime(2022, 7, 10, tzinfo=datetime.timezone(datetime.timedelta(hours=2))),
id="datetime_stdlib_fixed_offset",
),
],
)
def test_datetime(self, input_obj):
"""Test serialization and deserialization of various datetime-related objects."""
serialized_obj = serialize(input_obj)
deserialized_obj = deserialize(serialized_obj)
if isinstance(input_obj, (datetime.date, datetime.timedelta, Date)):
if isinstance(input_obj, datetime.datetime):
assert input_obj == deserialized_obj
assert input_obj.utcoffset() == deserialized_obj.utcoffset()
else:
assert input_obj.timestamp() == deserialized_obj.timestamp()
assert input_obj == deserialized_obj

@pytest.mark.parametrize(
("tz_input", "expected_tz_name"),
Expand Down Expand Up @@ -625,6 +630,12 @@ def test_timezone_serialize_fixed(self):

assert serialize(FixedTimezone(0)) == ("UTC", "pendulum.tz.timezone.FixedTimezone", 1, True)

def test_timezone_serialize_fixed_offset(self):
from airflow.sdk.serde.serializers.timezone import serialize

tz = datetime.timezone(datetime.timedelta(hours=-5))
assert serialize(tz) == (-18000, "pendulum.tz.timezone.FixedTimezone", 1, True)

def test_timezone_serialize_no_name(self):
from airflow.sdk.serde.serializers.timezone import serialize

Expand Down