dycw-utilities 0.124.0__tar.gz → 0.125.0__tar.gz

{dycw_utilities-0.124.0 → dycw_utilities-0.125.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.124.0
+Version: 0.125.0
 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.21; extra == 'test'
+Requires-Dist: hypothesis<6.132,>=6.131.24; 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'
@@ -27,8 +27,6 @@ Requires-Dist: img2pdf<0.7,>=0.6.0; extra == 'zzz-test-altair'
 Requires-Dist: polars-lts-cpu<1.31,>=1.30.0; extra == 'zzz-test-altair'
 Requires-Dist: vl-convert-python<1.8,>=1.7.0; extra == 'zzz-test-altair'
 Requires-Dist: whenever<0.9,>=0.8.2; extra == 'zzz-test-altair'
-Provides-Extra: zzz-test-astor
-Requires-Dist: astor<0.9,>=0.8.1; extra == 'zzz-test-astor'
 Provides-Extra: zzz-test-asyncio
 Provides-Extra: zzz-test-atomicwrites
 Requires-Dist: atomicwrites<1.5,>=1.4.1; extra == 'zzz-test-atomicwrites'
@@ -80,7 +78,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.21; extra == 'zzz-test-hypothesis'
+Requires-Dist: hypothesis<6.132,>=6.131.24; extra == 'zzz-test-hypothesis'
 Requires-Dist: luigi<3.7,>=3.6.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: numpy<2.3,>=2.2.6; extra == 'zzz-test-hypothesis'
 Requires-Dist: pathvalidate<3.3,>=3.2.3; extra == 'zzz-test-hypothesis'

{dycw_utilities-0.124.0 → dycw_utilities-0.125.0}/pyproject.toml

@@ -11,7 +11,6 @@ dev = [
   "aiohttp >= 3.11.16, < 3.12",  # for slack
   "aiosqlite >= 0.21.0, < 0.22",
   "altair >= 5.5.0, < 5.6",
-  "astor >= 0.8.1, < 0.9",
   "asyncpg >= 0.30.0, < 0.31",  # for sqlalchemy async
   "atomicwrites >= 1.4.1, < 1.5",
   "atools >= 0.14.2, < 0.15",
@@ -26,7 +25,7 @@ dev = [
   "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.21, < 6.132",
+  "hypothesis >= 6.131.24, < 6.132",
   "img2pdf >= 0.6.0, < 0.7",
   "lightweight-charts >= 2.1, < 2.2",
   "loguru >= 0.7.3, < 0.8",
@@ -92,11 +91,11 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.124.0"
+version = "0.125.0"
 
 [project.optional-dependencies]
 test = [
-  "hypothesis >= 6.131.21, < 6.132",
+  "hypothesis >= 6.131.24, < 6.132",
   "pytest >= 8.3.5, < 8.4",
   "pytest-asyncio >= 0.26.0, < 0.27",
   "pytest-cov >= 6.1.1, < 6.2",
@@ -119,7 +118,6 @@ zzz-test-altair = [
   "vl-convert-python >= 1.7.0, < 1.8",
   "whenever >= 0.8.2, < 0.9",
 ]
-zzz-test-astor = ["astor >= 0.8.1, < 0.9"]
 zzz-test-asyncio = []
 zzz-test-atomicwrites = ["atomicwrites >= 1.4.1, < 1.5"]
 zzz-test-atools = [
@@ -174,7 +172,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.21, < 6.132",
+  "hypothesis >= 6.131.24, < 6.132",
   "luigi >= 3.6.0, < 3.7",
   "numpy >= 2.2.6, < 2.3",
   "pathvalidate >= 3.2.3, < 3.3",
@@ -334,7 +332,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.124.0"
+current_version = "0.125.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -445,7 +443,6 @@ filterwarnings = [
   "ignore:Task .* without outputs has no custom complete.* method:UserWarning",  # luigi
   "ignore:There is no current event loop:DeprecationWarning",  # eventkit
   "ignore:Using fork.* can cause Polars to deadlock in the child process:RuntimeWarning",  # polars/pqdm
-  "ignore:ast.Num is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning",  # astor
   "ignore:loop is closed:ResourceWarning",  # redis
   "ignore:unclosed <StreamWriter .*>:ResourceWarning",  # redis
   "ignore:unclosed <socket.*socket .*>:ResourceWarning",  # redis

{dycw_utilities-0.124.0 → dycw_utilities-0.125.0}/src/tests/test_more_itertools.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Iterator
 from typing import TYPE_CHECKING, Any, ClassVar, TypeGuard
 
 from pytest import mark, param, raises
@@ -24,17 +25,45 @@ class TestBucketMapping:
     def test_main(self) -> None:
         mapping = bucket_mapping(self.iterable, lambda x: x[0])
         assert set(mapping) == {"a", "b", "c"}
+        for value in mapping.values():
+            assert isinstance(value, Iterator)
+            assert not isinstance(value, list)
         assert list(mapping["a"]) == ["a1", "a2"]
         assert list(mapping["b"]) == ["b1", "b2", "b3"]
         assert list(mapping["c"]) == ["c1", "c2"]
 
+    def test_transform(self) -> None:
+        mapping = bucket_mapping(
+            self.iterable, lambda x: x[0], transform=lambda x: int(x[-1])
+        )
+        assert set(mapping) == {"a", "b", "c"}
+        for value in mapping.values():
+            assert isinstance(value, Iterator)
+            assert not isinstance(value, list)
+        assert list(mapping["a"]) == [1, 2]
+        assert list(mapping["b"]) == [1, 2, 3]
+        assert list(mapping["c"]) == [1, 2]
+
     def test_list(self) -> None:
         mapping = bucket_mapping(self.iterable, lambda x: x[0], list=True)
         assert set(mapping) == {"a", "b", "c"}
+        for value in mapping.values():
+            assert isinstance(value, list)
         assert mapping["a"] == ["a1", "a2"]
         assert mapping["b"] == ["b1", "b2", "b3"]
         assert mapping["c"] == ["c1", "c2"]
 
+    def test_transform_and_list(self) -> None:
+        mapping = bucket_mapping(
+            self.iterable, lambda x: x[0], transform=lambda x: int(x[-1]), list=True
+        )
+        assert set(mapping) == {"a", "b", "c"}
+        for value in mapping.values():
+            assert isinstance(value, list)
+        assert mapping["a"] == [1, 2]
+        assert mapping["b"] == [1, 2, 3]
+        assert mapping["c"] == [1, 2]
+
 
 class TestPartitionList:
     def test_main(self) -> None:

{dycw_utilities-0.124.0 → dycw_utilities-0.125.0}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.124.0"
+__version__ = "0.125.0"

{dycw_utilities-0.124.0 → dycw_utilities-0.125.0}/src/utilities/more_itertools.py

@@ -37,25 +37,81 @@ _U = TypeVar("_U")
 
 @overload
 def bucket_mapping(
-    iterable: Iterable[_T], func: Callable[[_T], THashable], /, *, list: Literal[True]
+    iterable: Iterable[_T],
+    func: Callable[[_T], THashable],
+    /,
+    *,
+    transform: Callable[[_T], _U],
+    list: Literal[True],
+) -> Mapping[THashable, Sequence[_U]]: ...
+@overload
+def bucket_mapping(
+    iterable: Iterable[_T],
+    func: Callable[[_T], THashable],
+    /,
+    *,
+    transform: Callable[[_T], _U],
+    list: bool = False,
+) -> Mapping[THashable, Iterator[_U]]: ...
+@overload
+def bucket_mapping(
+    iterable: Iterable[_T],
+    func: Callable[[_T], THashable],
+    /,
+    *,
+    transform: Callable[[_T], _U] | None = None,
+    list: Literal[True],
 ) -> Mapping[THashable, Sequence[_T]]: ...
 @overload
 def bucket_mapping(
-    iterable: Iterable[_T], func: Callable[[_T], THashable], /, *, list: bool = False
+    iterable: Iterable[_T],
+    func: Callable[[_T], THashable],
+    /,
+    *,
+    transform: Callable[[_T], _U] | None = None,
+    list: bool = False,
 ) -> Mapping[THashable, Iterator[_T]]: ...
+@overload
+def bucket_mapping(
+    iterable: Iterable[_T],
+    func: Callable[[_T], THashable],
+    /,
+    *,
+    transform: Callable[[_T], _U] | None = None,
+    list: bool = False,
+) -> (
+    Mapping[THashable, Iterator[_T]]
+    | Mapping[THashable, Iterator[_U]]
+    | Mapping[THashable, Sequence[_T]]
+    | Mapping[THashable, Sequence[_U]]
+): ...
 def bucket_mapping(
     iterable: Iterable[_T],
     func: Callable[[_T], THashable],
     /,
     *,
+    transform: Callable[[_T], _U] | None = None,
     list: bool = False,  # noqa: A002
-) -> Mapping[THashable, Iterator[_T]] | Mapping[THashable, Sequence[_T]]:
+) -> (
+    Mapping[THashable, Iterator[_T]]
+    | Mapping[THashable, Iterator[_U]]
+    | Mapping[THashable, Sequence[_T]]
+    | Mapping[THashable, Sequence[_U]]
+):
     """Bucket the values of iterable into a mapping."""
     b = bucket(iterable, func)
     mapping = {key: b[key] for key in b}
-    if list:
-        return {key: builtins.list(value) for key, value in mapping.items()}
-    return mapping
+    match transform, list:
+        case None, False:
+            return mapping
+        case None, True:
+            return {k: builtins.list(v) for k, v in mapping.items()}
+        case _, False:
+            return {k: map(transform, v) for k, v in mapping.items()}
+        case _, True:
+            return {k: builtins.list(map(transform, v)) for k, v in mapping.items()}
+        case _ as never:
+            assert_never(never)
 
 
 ##

dycw_utilities-0.124.0/src/tests/test_astor.py

@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-from ast import Assign, Attribute, Call, Import, Load, Module, Name, alias
-
-from utilities.astor import module_to_source
-
-
-class TestModuleToSource:
-    def test_main(self) -> None:
-        import_dt = Import(names=[alias(name="datetime", asname="dt")])
-        assign = Assign(
-            targets=[Name(id="now")],
-            value=Call(
-                func=Attribute(
-                    value=Attribute(value=Name(id="dt", ctx=Load()), attr="datetime"),
-                    attr="now",
-                ),
-                args=[],
-                keywords=[],
-            ),
-        )
-        module = Module(body=[import_dt, assign], type_ignores=[])
-        result = module_to_source(module)
-        expected_with_ruff = """\
-import datetime as dt
-
-now = dt.datetime.now()
-"""
-        expected_without_ruff = """\
-import datetime as dt
-now = dt.datetime.now()
-"""
-        assert result in {expected_with_ruff, expected_without_ruff}

dycw_utilities-0.124.0/src/utilities/astor.py

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-from contextlib import suppress
-from subprocess import CalledProcessError, check_call
-from typing import TYPE_CHECKING
-
-from astor import to_source
-
-from utilities.tempfile import TemporaryDirectory
-
-if TYPE_CHECKING:
-    from ast import Module
-
-
-def module_to_source(module: Module, /) -> str:
-    """Write a module as a `ruff`-formatted string."""
-    src = to_source(module)
-    with TemporaryDirectory() as temp:
-        path = temp.joinpath("temp.py")
-        with path.open(mode="w") as fh:
-            _ = fh.write(src)
-        with suppress(CalledProcessError, FileNotFoundError):
-            _ = check_call(["ruff", "format", str(path)])
-        with path.open() as fh:
-            return fh.read()
-
-
-__all__ = ["module_to_source"]