dycw-utilities 0.166.0__tar.gz → 0.166.1__tar.gz

{dycw_utilities-0.166.0 → dycw_utilities-0.166.1}/PKG-INFO

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

{dycw_utilities-0.166.0 → dycw_utilities-0.166.1}/pyproject.toml

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

{dycw_utilities-0.166.0 → dycw_utilities-0.166.1}/src/tests/test_polars.py

@@ -838,21 +838,20 @@ class TestChoice:
 
 
 class TestColumnsToDict:
-    def test_main(self) -> None:
-        df = DataFrame(
-            data=[{"a": 1, "b": 11}, {"a": 2, "b": 12}, {"a": 3, "b": 13}],
-            schema={"a": Int64, "b": Int64},
-        )
-        mapping = columns_to_dict(df, "a", "b")
-        assert mapping == {1: 11, 2: 12, 3: 13}
+    schema: ClassVar[SchemaDict] = {"x": Int64, "y": Int64}
+
+    @mark.parametrize("x", [param("x"), param(col.x)])
+    @mark.parametrize("y", [param("y"), param(col.y)])
+    def test_main(self, *, x: IntoExprColumn, y: IntoExprColumn) -> None:
+        df = DataFrame(data=[(1, 2), (3, 4), (5, 6)], schema=self.schema, orient="row")
+        mapping = columns_to_dict(df, x, y)
+        expected = {1: 2, 3: 4, 5: 6}
+        assert mapping == expected
 
     def test_error(self) -> None:
-        df = DataFrame(
-            data=[{"a": 1, "b": 11}, {"a": 2, "b": 12}, {"a": 1, "b": 13}],
-            schema={"a": Int64, "b": Int64},
-        )
-        with raises(ColumnsToDictError, match="DataFrame must be unique on 'a':\n\n.*"):
-            _ = columns_to_dict(df, "a", "b")
+        df = DataFrame(data=[(1, 1), (1, 2), (1, 3)], schema=self.schema, orient="row")
+        with raises(ColumnsToDictError, match="DataFrame must be unique on 'x':\n\n.*"):
+            _ = columns_to_dict(df, "x", "y")
 
 
 class TestConcatSeries:

{dycw_utilities-0.166.0 → dycw_utilities-0.166.1}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.166.0"
+__version__ = "0.166.1"

{dycw_utilities-0.166.0 → dycw_utilities-0.166.1}/src/utilities/polars.py

@@ -830,13 +830,15 @@ def choice(
 ##
 
 
-def columns_to_dict(df: DataFrame, key: str, value: str, /) -> dict[Any, Any]:
+def columns_to_dict(
+    df: DataFrame, key: IntoExprColumn, value: IntoExprColumn, /
+) -> dict[Any, Any]:
     """Map a pair of columns into a dictionary. Must be unique on `key`."""
-    col_key = df[key]
-    if col_key.is_duplicated().any():
-        raise ColumnsToDictError(df=df, key=key)
-    col_value = df[value]
-    return dict(zip(col_key, col_value, strict=True))
+    df = df.select(key, value)
+    key_col, value_col = [df[get_expr_name(df, expr)] for expr in [key, value]]
+    if key_col.is_duplicated().any():
+        raise ColumnsToDictError(df=df, key=key_col.name)
+    return dict(zip(key_col, value_col, strict=True))
 
 
 @dataclass(kw_only=True, slots=True)