bux fix cache_kwargs (#129)

Author: malmans2

cacholote/cache.py

@@ -70,7 +70,7 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
 
         try:
             hexdigest = encode._hexdigestify_python_call(
-                func, *args, **kwargs, **cache_kwargs
+                func, *args, cache_kwargs=cache_kwargs, **kwargs
             )
         except encode.EncodeError as ex:
             if settings.return_cache_entry:

cacholote/encode.py

@@ -33,9 +33,12 @@
 def _hexdigestify_python_call(
     func_to_hex: str | Callable[..., Any],
     *args: Any,
+    cache_kwargs: dict[str, Any] = {},
     **kwargs: Any,
 ) -> str:
-    return utils.hexdigestify(dumps_python_call(func_to_hex, *args, **kwargs))
+    return utils.hexdigestify(
+        dumps_python_call(func_to_hex, *args, cache_kwargs=cache_kwargs, **kwargs)
+    )
 
 
 def inspect_fully_qualified_name(obj: Callable[..., Any]) -> str:
@@ -63,6 +66,7 @@ def dictify_python_object(obj: str | Callable[..., Any]) -> dict[str, str]:
 def dictify_python_call(
     func_to_dict: str | Callable[..., Any],
     *args: Any,
+    cache_kwargs: dict[str, Any] = {},
     **kwargs: Any,
 ) -> dict[str, Any]:
     callable_fqn = dictify_python_object(func_to_dict)["fully_qualified_name"]
@@ -89,6 +93,8 @@ def dictify_python_call(
         python_call_simple["args"] = args
     if kwargs:
         python_call_simple["kwargs"] = {k: kwargs[k] for k in sorted(kwargs)}
+    if cache_kwargs:
+        python_call_simple["cache_kwargs"] = dict(sorted(cache_kwargs.items()))
 
     return python_call_simple
 
@@ -189,6 +195,7 @@ def dumps(
 def dumps_python_call(
     func_to_dump: str | Callable[..., Any],
     *args: Any,
+    cache_kwargs: dict[str, Any] = {},
     **kwargs: Any,
 ) -> str:
     """Serialize python call to JSON formatted string.
@@ -199,12 +206,16 @@ def dumps_python_call(
         Function to serialize
     *args: Any
         Arguments of ``func``
+    cache_kwargs: dict
+        Additional arguments for hashing only
     **kwargs: Any
         Keyword arguments of ``func``
 
     Returns
     -------
     str
     """
-    python_call = dictify_python_call(func_to_dump, *args, **kwargs)
+    python_call = dictify_python_call(
+        func_to_dump, *args, cache_kwargs=cache_kwargs, **kwargs
+    )
     return dumps(python_call)

tests/test_30_cache.py

@@ -30,11 +30,22 @@ def cached_error() -> None:
     raise ValueError("test error")
 
 
+def test_cache_kwargs() -> None:
+    def test_func() -> datetime.datetime:
+        return datetime.datetime.now()
+
+    func1 = cache.cacheable(test_func, count=1)
+    func2 = cache.cacheable(test_func, count=2)
+    assert func1() != func2()
+    assert func1() == func1()
+    assert func2() == func2()
+
+
 @pytest.mark.parametrize(
     "cache_kwargs,expected_hash",
     [
         ({}, "a8260ac3cdc1404aa64a6fb71e853049"),
-        ({"foo": "bar"}, "ad4c1867757974cfccabc18c3a5078b9"),
+        ({"foo": "bar"}, "f732a8c299b41e9d73b7bf1d32a2fa68"),
     ],
 )
 def test_cacheable(cache_kwargs: dict[str, Any], expected_hash: str) -> None: