dycw-utilities 0.109.11__tar.gz → 0.109.13__tar.gz

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.109.11
+Version: 0.109.13
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: typing-extensions<4.14,>=4.13.1
 Provides-Extra: test
-Requires-Dist: hypothesis<6.132,>=6.131.6; extra == 'test'
+Requires-Dist: hypothesis<6.132,>=6.131.7; extra == 'test'
 Requires-Dist: pytest-asyncio<0.27,>=0.26.0; extra == 'test'
 Requires-Dist: pytest-cov<6.2,>=6.1.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
@@ -62,7 +62,7 @@ Requires-Dist: fastapi<0.116,>=0.115.11; extra == 'zzz-test-fastapi'
 Requires-Dist: httpx<0.29,>=0.28.1; extra == 'zzz-test-fastapi'
 Requires-Dist: uvicorn<0.35,>=0.34.1; extra == 'zzz-test-fastapi'
 Provides-Extra: zzz-test-fpdf2
-Requires-Dist: fpdf2<2.9,>=2.8.2; extra == 'zzz-test-fpdf2'
+Requires-Dist: fpdf2<2.9,>=2.8.3; extra == 'zzz-test-fpdf2'
 Requires-Dist: tzlocal<5.4,>=5.3.1; extra == 'zzz-test-fpdf2'
 Provides-Extra: zzz-test-functions
 Provides-Extra: zzz-test-functools
@@ -80,7 +80,7 @@ Provides-Extra: zzz-test-hypothesis
 Requires-Dist: aiosqlite<0.22,>=0.21.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: asyncpg<0.31,>=0.30.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: greenlet<3.3,>=3.2.0; extra == 'zzz-test-hypothesis'
-Requires-Dist: hypothesis<6.132,>=6.131.6; extra == 'zzz-test-hypothesis'
+Requires-Dist: hypothesis<6.132,>=6.131.7; extra == 'zzz-test-hypothesis'
 Requires-Dist: luigi<3.7,>=3.6.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: numpy<2.3,>=2.2.5; extra == 'zzz-test-hypothesis'
 Requires-Dist: pathvalidate<3.3,>=3.2.3; extra == 'zzz-test-hypothesis'
@@ -117,7 +117,7 @@ Provides-Extra: zzz-test-memory-profiler
 Requires-Dist: memory-profiler<0.62,>=0.61.0; extra == 'zzz-test-memory-profiler'
 Provides-Extra: zzz-test-modules
 Provides-Extra: zzz-test-more-itertools
-Requires-Dist: more-itertools<10.7,>=10.6.0; extra == 'zzz-test-more-itertools'
+Requires-Dist: more-itertools<10.8,>=10.7.0; extra == 'zzz-test-more-itertools'
 Provides-Extra: zzz-test-numpy
 Requires-Dist: numpy<2.3,>=2.2.5; extra == 'zzz-test-numpy'
 Provides-Extra: zzz-test-operator

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/pyproject.toml

@@ -24,15 +24,15 @@ dev = [
   "dacite >= 1.9.2, < 1.10",
   "eventkit >= 1.0.3, < 1.1",
   "fastapi >= 0.115.11, < 0.116",
-  "fpdf2 >= 2.8.2, < 2.9",
+  "fpdf2 >= 2.8.3, < 2.9",
   "greenlet >= 3.2.0, < 3.3",  # for sqlalchemy async
   "httpx >= 0.28.1, < 0.29",  # for fastapi
-  "hypothesis >= 6.131.6, < 6.132",
+  "hypothesis >= 6.131.7, < 6.132",
   "img2pdf >= 0.6.0, < 0.7",
   "loguru >= 0.7.3, < 0.8",
   "luigi >= 3.6.0, < 3.7",
   "memory-profiler >= 0.61.0, < 0.62",
-  "more-itertools >= 10.6.0, < 10.7",
+  "more-itertools >= 10.7.0, < 10.8",
   "nest-asyncio >= 1.6.0, < 1.7",  # for sqlalchemy async
   "nox >= 2025.2.9, < 2025.3",
   "numpy >= 2.2.5, < 2.3",
@@ -91,11 +91,11 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.109.11"
+version = "0.109.13"
 
 [project.optional-dependencies]
 test = [
-  "hypothesis >= 6.131.6, < 6.132",
+  "hypothesis >= 6.131.7, < 6.132",
   "pytest >= 8.3.5, < 8.4",
   "pytest-asyncio >= 0.26.0, < 0.27",
   "pytest-cov >= 6.1.1, < 6.2",
@@ -152,7 +152,7 @@ zzz-test-fastapi = [
   "uvicorn >= 0.34.1, < 0.35",
 ]
 zzz-test-fpdf2 = [
-  "fpdf2 >= 2.8.2, < 2.9",
+  "fpdf2 >= 2.8.3, < 2.9",
   "tzlocal >= 5.3.1, < 5.4",
 ]
 zzz-test-functions = []
@@ -173,7 +173,7 @@ zzz-test-hypothesis = [
   "aiosqlite >= 0.21.0, < 0.22",
   "asyncpg >= 0.30.0, < 0.31",  # for sqlalchemy async
   "greenlet >= 3.2.0, < 3.3",  # for sqlalchemy async
-  "hypothesis >= 6.131.6, < 6.132",
+  "hypothesis >= 6.131.7, < 6.132",
   "luigi >= 3.6.0, < 3.7",
   "numpy >= 2.2.5, < 2.3",
   "pathvalidate >= 3.2.3, < 3.3",
@@ -210,7 +210,7 @@ zzz-test-luigi = [
 zzz-test-math = ["numpy >= 2.2.5, < 2.3"]
 zzz-test-memory-profiler = ["memory-profiler >= 0.61.0, < 0.62"]
 zzz-test-modules = []
-zzz-test-more-itertools = ["more-itertools >= 10.6.0, < 10.7"]
+zzz-test-more-itertools = ["more-itertools >= 10.7.0, < 10.8"]
 zzz-test-numpy = ["numpy >= 2.2.5, < 2.3"]
 zzz-test-operator = [
   "polars-lts-cpu >= 1.27.1, < 1.28",
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.109.11"
+current_version = "0.109.13"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/src/tests/test_altair.py

@@ -31,7 +31,7 @@ from utilities.altair import (
 )
 from utilities.datetime import get_now
 from utilities.functions import ensure_class
-from utilities.hypothesis import zoned_datetimes
+from utilities.hypothesis import text_ascii, zoned_datetimes
 from utilities.polars import DatetimeUTC, zoned_datetime
 from utilities.zoneinfo import UTC, HongKong, Tokyo
 
@@ -71,6 +71,7 @@ class TestPlotDataFrames:
         | none(),
         height=integers(1, 100),
         width=integers(1, 100),
+        title=text_ascii() | none(),
     )
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     def test_main(
@@ -85,8 +86,11 @@ class TestPlotDataFrames:
         | None,
         height: int,
         width: int,
+        title: str | None,
     ) -> None:
-        _ = plot_dataframes(time_series, x=x, y=y, height=height, width=width)
+        _ = plot_dataframes(
+            time_series, x=x, y=y, height=height, width=width, title=title
+        )
 
     @given(time_zone=sampled_from([UTC, HongKong, Tokyo]))
     def test_auto_localization(self, *, time_zone: ZoneInfo) -> None:

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/src/tests/test_iterables.py

@@ -97,6 +97,7 @@ from utilities.iterables import (
     ensure_iterable_not_str,
     expanding_window,
     filter_include_and_exclude,
+    group_consecutive_integers,
     groupby_lists,
     hashable_to_iterable,
     is_iterable,
@@ -118,6 +119,7 @@ from utilities.iterables import (
     sum_mappings,
     take,
     transpose,
+    ungroup_consecutive_integers,
     unique_everseen,
 )
 from utilities.sentinel import Sentinel, sentinel
@@ -890,6 +892,18 @@ class TestFilterIncludeAndExclude:
         assert result == expected
 
 
+class TestGroupAndUngroupConsecutiveIntegers:
+    @given(xs=lists(integers(), unique=True).map(sorted))
+    def test_main(self, *, xs: list[int]) -> None:
+        result = list(ungroup_consecutive_integers(group_consecutive_integers(xs)))
+        assert result == xs
+
+    def test_example(self) -> None:
+        result = list(group_consecutive_integers([1, 2, 3, 6, 7, 10, 11, 12]))
+        expected = [(1, 3), (6, 7), (10, 12)]
+        assert result == expected
+
+
 class TestGroupbyLists:
     iterable: ClassVar[str] = "AAAABBBCCDAABB"
 

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.109.11"
+__version__ = "0.109.13"

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/src/utilities/altair.py

@@ -62,6 +62,7 @@ def plot_dataframes(
     height: int = _HEIGHT,
     width: int = _WIDTH,
     interpolate: Any = Undefined,
+    title: str | None = None,
 ) -> VConcatChart:
     """Plot a DataFrame as a set of time series, with a multi-line tooltip."""
     import polars as pl
@@ -143,9 +144,12 @@ def plot_dataframes(
         for line, pts, rls, spec in zip(lines, points, rules, specs, strict=True)
     ]
     zoom = selection_interval(bind="scales", encodings=["x"])
-    return (
+    chart = (
         vconcat(*layers).add_params(zoom).resolve_scale(color="independent", x="shared")
     )
+    if title is not None:
+        chart = chart.properties(title=title)
+    return chart
 
 
 def _plot_dataframes_get_spec(

{dycw_utilities-0.109.11 → dycw_utilities-0.109.13}/src/utilities/iterables.py

@@ -19,7 +19,7 @@ from enum import Enum
 from functools import cmp_to_key, partial, reduce
 from itertools import accumulate, chain, groupby, islice, pairwise, product
 from math import isnan
-from operator import add, or_
+from operator import add, itemgetter, or_
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -861,6 +861,24 @@ def filter_include_and_exclude(
 ##
 
 
+def group_consecutive_integers(iterable: Iterable[int], /) -> Iterable[tuple[int, int]]:
+    """Group consecutive integers."""
+    integers = sorted(iterable)
+    for _, group in groupby(enumerate(integers), key=lambda x: x[1] - x[0]):
+        as_list = list(map(itemgetter(1), group))
+        yield as_list[0], as_list[-1]
+
+
+def ungroup_consecutive_integers(
+    iterable: Iterable[tuple[int, int]], /
+) -> Iterable[int]:
+    """Ungroup consecutive integers."""
+    return chain.from_iterable(range(start, end + 1) for start, end in iterable)
+
+
+##
+
+
 @overload
 def groupby_lists(
     iterable: Iterable[_T], /, *, key: None = None
@@ -1504,6 +1522,7 @@ __all__ = [
     "ensure_iterable_not_str",
     "expanding_window",
     "filter_include_and_exclude",
+    "group_consecutive_integers",
     "groupby_lists",
     "hashable_to_iterable",
     "is_iterable",
@@ -1525,5 +1544,6 @@ __all__ = [
     "sum_mappings",
     "take",
     "transpose",
+    "ungroup_consecutive_integers",
     "unique_everseen",
 ]