dycw-utilities 0.151.5__tar.gz → 0.151.7__tar.gz

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.151.5
+Version: 0.151.7
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/pyproject.toml

@@ -232,7 +232,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.151.5"
+version = "0.151.7"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -265,7 +265,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.151.5"
+current_version = "0.151.7"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/src/tests/test_whenever.py

@@ -64,6 +64,7 @@ from utilities.whenever import (
     ToMonthsAndDaysError,
     ToNanosecondsError,
     ToPyTimeDeltaError,
+    ToZonedDateTimeError,
     WheneverLogRecord,
     _MinMaxDatePeriodError,
     _RoundDateOrDateTimeDateTimeIntraDayWithWeekdayError,
@@ -1183,6 +1184,12 @@ class TestToYears:
             _ = to_years(delta)
 
 
+zoned_datetimes_2000 = zoned_datetimes(
+    min_value=ZonedDateTime(2000, 1, 1, tz=UTC.key),
+    max_value=ZonedDateTime(2000, 12, 31, tz=UTC.key),
+)
+
+
 class TestToZonedDateTime:
     @given(date_time=zoned_datetimes())
     def test_date_time(self, *, date_time: ZonedDateTime) -> None:
@@ -1192,6 +1199,17 @@ class TestToZonedDateTime:
     def test_none_or_sentinel(self, *, date_time: None | Sentinel) -> None:
         assert to_zoned_date_time(date_time=date_time) is date_time
 
+    @given(date_time=zoned_datetimes_2000)
+    def test_py_date_time_zone_info(self, *, date_time: ZonedDateTime) -> None:
+        assert to_zoned_date_time(date_time=date_time.py_datetime()) == date_time
+
+    @given(date_time=zoned_datetimes_2000)
+    def test_py_date_time_dt_utc(self, *, date_time: ZonedDateTime) -> None:
+        result = to_zoned_date_time(
+            date_time=date_time.py_datetime().astimezone(dt.UTC)
+        )
+        assert result == date_time
+
     @given(date_time1=zoned_datetimes(), date_time2=zoned_datetimes())
     def test_replace_non_sentinel(
         self, *, date_time1: ZonedDateTime, date_time2: ZonedDateTime
@@ -1217,6 +1235,13 @@ class TestToZonedDateTime:
     def test_callable(self, *, date_time: ZonedDateTime) -> None:
         assert to_zoned_date_time(date_time=lambda: date_time) == date_time
 
+    def test_error_py_date_time(self) -> None:
+        with raises(
+            ToZonedDateTimeError,
+            match=r"Expected date-time to have a `ZoneInfo` or `dt\.UTC` as its timezone; got None",
+        ):
+            _ = to_zoned_date_time(date_time=NOW_UTC.py_datetime().replace(tzinfo=None))
+
 
 class TestTwoDigitYearMonth:
     def test_parse_common_iso(self) -> None:

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.151.5"
+__version__ = "0.151.7"

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/src/utilities/redis.py

@@ -522,7 +522,7 @@ async def publish[T](
     /,
     *,
     serializer: Callable[[T], EncodableT],
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> int: ...
 @overload
 async def publish(
@@ -532,7 +532,7 @@ async def publish(
     /,
     *,
     serializer: None = None,
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> int: ...
 @overload
 async def publish[T](
@@ -542,7 +542,7 @@ async def publish[T](
     /,
     *,
     serializer: Callable[[T], EncodableT] | None = None,
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> int: ...
 async def publish[T](
     redis: Redis,
@@ -551,7 +551,7 @@ async def publish[T](
     /,
     *,
     serializer: Callable[[T], EncodableT] | None = None,
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> int:
     """Publish an object to a channel."""
     match data, serializer:  # skipif-ci-and-not-linux
@@ -587,7 +587,7 @@ async def publish_many[T](
     /,
     *,
     serializer: Callable[[T], EncodableT] | None = None,
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> Sequence[bool]:
     """Publish an object/multiple objects to a channel."""
     async with TaskGroup() as tg:
@@ -613,7 +613,7 @@ async def _try_publish[T](
     /,
     *,
     serializer: Callable[[T], EncodableT] | None = None,
-    timeout: Delta = _PUBLISH_TIMEOUT,
+    timeout: Delta | None = _PUBLISH_TIMEOUT,
 ) -> bool:
     try:
         _ = await publish(redis, channel, data, serializer=serializer, timeout=timeout)

{dycw_utilities-0.151.5 → dycw_utilities-0.151.7}/src/utilities/whenever.py

@@ -16,6 +16,7 @@ from typing import (
     overload,
     override,
 )
+from zoneinfo import ZoneInfo
 
 from whenever import (
     Date,
@@ -36,8 +37,6 @@ from utilities.tzlocal import LOCAL_TIME_ZONE, LOCAL_TIME_ZONE_NAME
 from utilities.zoneinfo import UTC, get_time_zone_name
 
 if TYPE_CHECKING:
-    from zoneinfo import ZoneInfo
-
     from utilities.types import (
         DateOrDateTimeDelta,
         DateTimeRoundMode,
@@ -1418,22 +1417,40 @@ class _ToYearsTimeError(ToYearsError):
 
 
 @overload
-def to_zoned_date_time(*, date_time: MaybeCallableZonedDateTime) -> ZonedDateTime: ...
+def to_zoned_date_time(
+    *, date_time: MaybeCallableZonedDateTime | dt.datetime
+) -> ZonedDateTime: ...
 @overload
 def to_zoned_date_time(*, date_time: None) -> None: ...
 @overload
 def to_zoned_date_time(*, date_time: Sentinel) -> Sentinel: ...
 def to_zoned_date_time(
-    *, date_time: MaybeCallableZonedDateTime | None | Sentinel = sentinel
+    *, date_time: MaybeCallableZonedDateTime | dt.datetime | None | Sentinel = sentinel
 ) -> ZonedDateTime | None | Sentinel:
     """Resolve into a zoned date_time."""
     match date_time:
         case ZonedDateTime() | None | Sentinel():
             return date_time
+        case dt.datetime():
+            if isinstance(date_time.tzinfo, ZoneInfo):
+                return ZonedDateTime.from_py_datetime(date_time)
+            if date_time.tzinfo is dt.UTC:
+                return ZonedDateTime.from_py_datetime(date_time.astimezone(UTC))
+            raise ToZonedDateTimeError(date_time=date_time)
         case Callable() as func:
             return to_zoned_date_time(date_time=func())
         case _ as never:
             assert_never(never)
+    return None
+
+
+@dataclass(kw_only=True, slots=True)
+class ToZonedDateTimeError(Exception):
+    date_time: dt.datetime
+
+    @override
+    def __str__(self) -> str:
+        return f"Expected date-time to have a `ZoneInfo` or `dt.UTC` as its timezone; got {self.date_time.tzinfo}"
 
 
 ##