dycw-utilities 0.162.2__tar.gz → 0.162.3__tar.gz

{dycw_utilities-0.162.2 → dycw_utilities-0.162.3}/PKG-INFO

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

{dycw_utilities-0.162.2 → dycw_utilities-0.162.3}/pyproject.toml

@@ -109,7 +109,7 @@ operator = [
   "polars",
 ]
 optuna = [
-  "optuna >=4.4.0, <4.5",
+  "optuna >=4.5.0, <4.6",
 ]
 orjson = [
   "orjson >=3.11.0, <3.12",
@@ -227,7 +227,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.162.2"
+version = "0.162.3"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -259,7 +259,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.162.2"
+current_version = "0.162.3"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.162.2 → dycw_utilities-0.162.3}/src/tests/test_orjson.py

@@ -23,6 +23,7 @@ from hypothesis.strategies import (
 from orjson import JSONDecodeError
 from polars import Object, String, UInt64
 from pytest import approx, mark, param, raises
+from whenever import ZonedDateTime
 
 from tests.conftest import SKIPIF_CI_AND_WINDOWS
 from tests.test_objects.objects import (
@@ -60,6 +61,7 @@ from utilities.hypothesis import (
     text_ascii,
     text_printable,
     time_periods,
+    zoned_date_time_periods,
     zoned_date_times,
 )
 from utilities.iterables import always_iterable, one
@@ -86,12 +88,21 @@ from utilities.sentinel import Sentinel, sentinel
 from utilities.types import LogLevel, MaybeIterable, PathLike
 from utilities.typing import get_args
 from utilities.tzlocal import LOCAL_TIME_ZONE
-from utilities.whenever import MINUTE, SECOND, DatePeriod, TimePeriod, get_now
+from utilities.whenever import (
+    HOUR,
+    MINUTE,
+    SECOND,
+    DatePeriod,
+    TimePeriod,
+    ZonedDateTimePeriod,
+    get_now,
+)
+from utilities.zoneinfo import UTC
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from whenever import Date, ZonedDateTime
+    from whenever import Date
 
     from utilities.types import Dataclass, StrMapping
 
@@ -130,7 +141,7 @@ class TestGetLogRecords:
         assert record.name == str(tmp_path)
         assert record.message == ""
         assert record.level == WARNING
-        assert record.line_num == approx(102, rel=0.1)
+        assert record.line_num == approx(118, rel=0.1)
         assert abs(record.datetime - get_now()) <= MINUTE
         assert record.func_name == "test_main"
         assert record.stack_info is None
@@ -667,6 +678,11 @@ class TestSerializeAndDeserialize:
         )
         assert result == exp_res
 
+    @given(period=zoned_date_time_periods())
+    def test_zoned_date_time_period(self, *, period: ZonedDateTimePeriod) -> None:
+        result = deserialize(serialize(period))
+        assert result == period
+
 
 class TestSerialize:
     @given(text=text_printable())
@@ -730,6 +746,12 @@ class TestSerialize:
         with raises(_SerializeIntegerError, match="Integer .* is out of range"):
             _ = serialize(x)
 
+    def test_zoned_date_time_period(self) -> None:
+        start = ZonedDateTime(2000, 1, 2, 12, 34, 45, tz=UTC.key)
+        result = serialize(ZonedDateTimePeriod(start, start + HOUR))
+        expected = b'"[zp]2000-01-02T12:34:45,2000-01-02T13:34:45+00:00[UTC]"'
+        assert result == expected
+
 
 class TestObjectHookGetObject:
     def test_main(self) -> None:

{dycw_utilities-0.162.2 → dycw_utilities-0.162.3}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.162.2"
+__version__ = "0.162.3"

{dycw_utilities-0.162.2 → dycw_utilities-0.162.3}/src/utilities/orjson.py

@@ -218,9 +218,7 @@ def _pre_process(
         case ZonedDateTime() as date_time:
             return f"[{_Prefixes.zoned_date_time.value}]{date_time}"
         case ZonedDateTimePeriod() as period:
-            return (
-                f"[{_Prefixes.zoned_date_time_period.value}]{period.start},{period.end}"
-            )
+            return f"[{_Prefixes.zoned_date_time_period.value}]{period.start.to_plain()},{period.end}"
         case dt.datetime() as py_datetime:
             match py_datetime.tzinfo:
                 case None:
@@ -512,9 +510,9 @@ def _object_hook(
             if match := _ZONED_DATE_TIME_PATTERN.search(text):
                 return ZonedDateTime.parse_common_iso(match.group(1))
             if match := _ZONED_DATE_TIME_PERIOD_PATTERN.search(text):
-                start, end = map(
-                    ZonedDateTime.parse_common_iso, match.group(1).split(",")
-                )
+                start, end = match.group(1).split(",")
+                end = ZonedDateTime.parse_common_iso(end)
+                start = PlainDateTime.parse_common_iso(start).assume_tz(end.tz)
                 return ZonedDateTimePeriod(start, end)
             if (
                 exc_class := _object_hook_exception_class(