feat: enhance caching logic with static method and coverage configuration

Author: zoola969

py_cashier/_key_builders/_default.py

@@ -61,7 +61,8 @@ def __init__(
             delimiter=delimiter,
         )
 
-    def _build_key_prefix(self, func: Callable[..., Any], prefix: str | None) -> str:
+    @staticmethod
+    def _build_key_prefix(func: Callable[..., Any], prefix: str | None) -> str:
         """Build the prefix for the cache key."""
         if not prefix:
             return f"{inspect.getfile(func)}:{func.__name__}"

py_cashier/_utils.py

@@ -122,7 +122,8 @@ def get_call_args(
     for name, info in by_name.items():
         if name in res:
             continue
-        if info.default is NOT_SET:
+        # Possible only if the function was called without one of the arguments
+        if info.default is NOT_SET:  # pragma: no cover
             msg = f"Default value for argument '{name}' is not set"
             raise RuntimeError(msg)
         res[name] = info.default

pyproject.toml

@@ -62,6 +62,16 @@ color = true
 line-length = 120
 target-version = ['py39']
 
+[tool.coverage.report]
+exclude_also = [
+    "def __repr__",
+    "if TYPE_CHECKING",
+    "if typing.TYPE_CHECKING",
+]
+omit = [
+    "tests/*",
+]
+
 [tool.hatch.version]
 source = "uv-dynamic-versioning"
 

tests/test__default_key_builder.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import inspect
 from typing import Any, Callable
 
@@ -34,3 +36,22 @@ def test__default_key_builder__build_key(
         DefaultKeyBuilder(func=func, key_serializer=StrKeySerializer, delimiter=",").build_key(*args, **kwargs)
         == expected_key
     )
+
+
+def _func() -> None:
+    return
+
+
+_TEST_FILE = inspect.getfile(_func)
+
+
+@pytest.mark.parametrize(
+    ("prefix", "expected"),
+    [
+        (None, f"{_TEST_FILE}:_func"),
+        ("", f"{_TEST_FILE}:_func"),
+        ("_prefix_", f"_prefix_:{_TEST_FILE}:_func"),
+    ],
+)
+def test__default_key_builder__build_key_prefix(prefix: str | None, expected: str):
+    assert DefaultKeyBuilder._build_key_prefix(_func, prefix) == expected

tests/test__serializers.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any
 from unittest.mock import Mock, patch
 
@@ -17,15 +17,43 @@
         (StrKeySerializer, [1, 2, 3], "[1, 2, 3]"),
         (StrKeySerializer, {"a": 1, "b": 2}, "{'a': 1, 'b': 2}"),
         (StrKeySerializer, None, "None"),
-        (StrKeySerializer, datetime(2000, 1, 1), "2000-01-01 00:00:00"),
+        (
+            StrKeySerializer,
+            datetime(2000, 1, 1, tzinfo=None),  # noqa: DTZ001
+            "2000-01-01 00:00:00",
+        ),
+        (
+            StrKeySerializer,
+            datetime(2000, 1, 1),  # noqa: DTZ001
+            "2000-01-01 00:00:00",
+        ),
+        (
+            StrKeySerializer,
+            datetime(2000, 1, 1, tzinfo=timezone.utc),
+            "2000-01-01 00:00:00+00:00",
+        ),
         # ReprKeySerializer tests
         (ReprKeySerializer, 123, "123"),
         (ReprKeySerializer, 123.45, "123.45"),
         (ReprKeySerializer, "hello", "'hello'"),  # Note the quotes
         (ReprKeySerializer, [1, 2, 3], "[1, 2, 3]"),
         (ReprKeySerializer, {"a": 1, "b": 2}, "{'a': 1, 'b': 2}"),
         (ReprKeySerializer, None, "None"),
-        (ReprKeySerializer, datetime(2000, 1, 1), "datetime.datetime(2000, 1, 1, 0, 0)"),
+        (
+            ReprKeySerializer,
+            datetime(2000, 1, 1, tzinfo=None),  # noqa: DTZ001
+            "datetime.datetime(2000, 1, 1, 0, 0)",
+        ),
+        (
+            ReprKeySerializer,
+            datetime(2000, 1, 1),  # noqa: DTZ001
+            "datetime.datetime(2000, 1, 1, 0, 0)",
+        ),
+        (
+            ReprKeySerializer,
+            datetime(2000, 1, 1, tzinfo=timezone.utc),
+            "datetime.datetime(2000, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)",
+        ),
     ],
 )
 def test_basic_serializers(serializer_class: type[KeySerializer], value: Any, expected: str) -> None: