dycw-utilities 0.136.10__tar.gz → 0.137.0__tar.gz

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/PKG-INFO

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

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/pyproject.toml

@@ -105,7 +105,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.136.10"
+version = "0.137.0"
 
 [project.optional-dependencies]
 logging = [
@@ -133,7 +133,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.136.10"
+current_version = "0.137.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/tests/test_logging.py

@@ -38,7 +38,7 @@ from utilities.logging import (
 from utilities.text import unique_str
 from utilities.types import LogLevel
 from utilities.typing import get_args
-from utilities.whenever import format_compact, get_now
+from utilities.whenever import format_compact, get_now, to_local_plain
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
@@ -192,7 +192,7 @@ class TestComputeRolloverActions:
 
         await sleep(1)
         tmp_path.joinpath("log.txt").touch()
-        now = format_compact(get_now().to_plain())
+        now = format_compact(to_local_plain(get_now()))
         tmp_path.joinpath(f"log.99__{now}__{now}.txt").touch()
         actions = _compute_rollover_actions(tmp_path, "log", ".txt")
         assert len(actions.deletions) == 2
@@ -319,7 +319,7 @@ class TestRotatingLogFile:
     def test_from_path_with_index_and_end(
         self, *, index: int, end: ZonedDateTime
     ) -> None:
-        path = Path(f"log.{index}__{format_compact(end.to_plain())}.txt")
+        path = Path(f"log.{index}__{format_compact(to_local_plain(end))}.txt")
         result = _RotatingLogFile.from_path(path, "log", ".txt")
         assert result is not None
         assert result.stem == "log"
@@ -334,7 +334,7 @@ class TestRotatingLogFile:
     ) -> None:
         start, end = datetimes
         path = Path(
-            f"log.{index}__{format_compact(start.to_plain())}__{format_compact(end.to_plain())}.txt"
+            f"log.{index}__{format_compact(to_local_plain(start))}__{format_compact(to_local_plain(end))}.txt"
         )
         result = _RotatingLogFile.from_path(path, "log", ".txt")
         assert result is not None
@@ -366,7 +366,7 @@ class TestRotatingLogFile:
             directory=root, stem="log", suffix=".txt", index=index, end=end
         )
         assert file.path == root.joinpath(
-            f"log.{index}__{format_compact(end.to_plain())}.txt"
+            f"log.{index}__{format_compact(to_local_plain(end))}.txt"
         )
 
     @given(
@@ -382,7 +382,7 @@ class TestRotatingLogFile:
             directory=root, stem="log", suffix=".txt", index=index, start=start, end=end
         )
         assert file.path == root.joinpath(
-            f"log.{index}__{format_compact(start.to_plain())}__{format_compact(end.to_plain())}.txt"
+            f"log.{index}__{format_compact(to_local_plain(start))}__{format_compact(to_local_plain(end))}.txt"
         )
 
 

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/tests/test_sqlalchemy.py

@@ -89,7 +89,7 @@ from utilities.sqlalchemy import (
 )
 from utilities.text import strip_and_dedent
 from utilities.typing import get_args, get_literal_elements
-from utilities.whenever import SECOND, format_compact, get_now
+from utilities.whenever import SECOND, format_compact, get_now, to_local_plain
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
@@ -102,9 +102,8 @@ if TYPE_CHECKING:
 
 def _table_names() -> str:
     """Generate at unique string."""
-    now = get_now()
     key = str(uuid4()).replace("-", "")
-    return f"{format_compact(now)}_{key}"
+    return f"{format_compact(to_local_plain(get_now()))}_{key}"
 
 
 @overload

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/tests/test_whenever.py

@@ -99,6 +99,7 @@ from utilities.whenever import (
     to_date,
     to_date_time_delta,
     to_days,
+    to_local_plain,
     to_nanos,
     to_time_delta,
     to_zoned_date_time,
@@ -636,6 +637,13 @@ class TestToDays:
             _ = to_days(delta)
 
 
+class TestToLocalPlain:
+    @given(date_time=zoned_datetimes())
+    def test_main(self, *, date_time: ZonedDateTime) -> None:
+        result = to_local_plain(date_time)
+        assert isinstance(result, PlainDateTime)
+
+
 class TestToZonedDateTime:
     @given(date_time=zoned_datetimes())
     def test_date_time(self, *, date_time: ZonedDateTime) -> None:

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.136.10"
+__version__ = "0.137.0"

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/fpdf2.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, override
 from fpdf import FPDF
 from fpdf.enums import XPos, YPos
 
-from utilities.whenever import format_compact, get_now_local
+from utilities.whenever import format_compact, get_now, to_local_plain
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -47,7 +47,7 @@ def yield_pdf(*, header: str | None = None) -> Iterator[_BasePDF]:
         def footer(self) -> None:
             self.set_y(-15)
             self.set_font(family="Helvetica", style="I", size=8)
-            page_no, now = (self.page_no(), format_compact(get_now_local().to_plain()))
+            page_no, now = (self.page_no(), format_compact(to_local_plain(get_now())))
             text = f"page {page_no}/{{}}; {now}"
             _ = self.cell(
                 w=0,

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/logging.py

@@ -45,7 +45,12 @@ from utilities.re import (
 )
 from utilities.sentinel import Sentinel, sentinel
 from utilities.tzlocal import LOCAL_TIME_ZONE_NAME
-from utilities.whenever import WheneverLogRecord, format_compact, get_now_local
+from utilities.whenever import (
+    WheneverLogRecord,
+    format_compact,
+    get_now_local,
+    to_local_plain,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Mapping
@@ -533,9 +538,9 @@ class _RotatingLogFile:
             case int() as index, None, None:
                 tail = str(index)
             case int() as index, None, ZonedDateTime() as end:
-                tail = f"{index}__{format_compact(end.to_plain())}"
+                tail = f"{index}__{format_compact(to_local_plain(end))}"
             case int() as index, ZonedDateTime() as start, ZonedDateTime() as end:
-                tail = f"{index}__{format_compact(start.to_plain())}__{format_compact(end.to_plain())}"
+                tail = f"{index}__{format_compact(to_local_plain(start))}__{format_compact(to_local_plain(end))}"
             case _:  # pragma: no cover
                 raise ImpossibleCaseError(
                     case=[f"{self.index=}", f"{self.start=}", f"{self.end=}"]

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/pyinstrument.py

@@ -8,7 +8,7 @@ from pyinstrument.profiler import Profiler
 
 from utilities.atomicwrites import writer
 from utilities.pathlib import get_path
-from utilities.whenever import format_compact, get_now_local
+from utilities.whenever import format_compact, get_now, to_local_plain
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -22,7 +22,7 @@ def profile(*, path: MaybeCallablePathLike | None = Path.cwd) -> Iterator[None]:
     with Profiler() as profiler:
         yield
     filename = get_path(path=path).joinpath(
-        f"profile__{format_compact(get_now_local().to_plain())}.html"
+        f"profile__{format_compact(to_local_plain(get_now()))}.html"
     )
     with writer(filename) as temp, temp.open(mode="w") as fh:
         _ = fh.write(profiler.output_html())

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/traceback.py

@@ -31,6 +31,7 @@ from utilities.whenever import (
     format_compact,
     get_now,
     get_now_local,
+    to_local_plain,
     to_zoned_date_time,
 )
 
@@ -96,8 +97,8 @@ def _yield_header_lines(
     """Yield the header lines."""
     now = get_now_local()
     start_use = to_zoned_date_time(date_time=start)
-    yield f"Date/time | {format_compact(now.to_plain())}"
-    start_str = "" if start_use is None else format_compact(start_use.to_plain())
+    yield f"Date/time | {format_compact(now)}"
+    start_str = "" if start_use is None else format_compact(start_use)
     yield f"Started   | {start_str}"
     delta = None if start_use is None else (now - start_use)
     delta_str = "" if delta is None else delta.format_common_iso()
@@ -256,7 +257,7 @@ def _make_except_hook_inner(
     if path is not None:
         path = (
             get_path(path=path)
-            .joinpath(format_compact(get_now_local().to_plain()))
+            .joinpath(format_compact(to_local_plain(get_now())))
             .with_suffix(".txt")
         )
         full = format_exception_stack(

{dycw_utilities-0.136.10 → dycw_utilities-0.137.0}/src/utilities/whenever.py

@@ -33,7 +33,7 @@ from utilities.platform import get_strftime
 from utilities.re import ExtractGroupsError, extract_groups
 from utilities.sentinel import Sentinel, sentinel
 from utilities.types import DateTimeRoundUnit, MaybeStr
-from utilities.tzlocal import LOCAL_TIME_ZONE
+from utilities.tzlocal import LOCAL_TIME_ZONE, LOCAL_TIME_ZONE_NAME
 from utilities.zoneinfo import UTC, get_time_zone_name
 
 if TYPE_CHECKING:
@@ -668,6 +668,14 @@ def to_date_time_delta(nanos: int, /) -> DateTimeDelta:
 ##
 
 
+def to_local_plain(date_time: ZonedDateTime, /) -> PlainDateTime:
+    """Convert a datetime to its local/plain variant."""
+    return date_time.to_tz(LOCAL_TIME_ZONE_NAME).to_plain()
+
+
+##
+
+
 def to_nanos(delta: DateTimeDelta, /) -> int:
     """Compute the number of nanoseconds in a date-time delta."""
     months, days, _, _ = delta.in_months_days_secs_nanos()
@@ -901,6 +909,7 @@ __all__ = [
     "to_date",
     "to_date_time_delta",
     "to_days",
+    "to_local_plain",
     "to_nanos",
     "to_zoned_date_time",
 ]