persistent-function-cache 0.1.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

persistent_cache/caches/deep_learning.py

@@ -1,18 +1,5 @@
-from collections.abc import Callable
+import functools
 
 from persistent_cache.main import decorator
-from persistent_cache.models import F, Path
-from persistent_cache.reducers import Reducer
 
-
-def cache(
-    function: F | None = None,
-    *,
-    key_reducer: type[Reducer] | None = None,
-    cache_path: Path = Path.cache,
-) -> Callable[[F], F]:
-    if key_reducer is None:
-        from persistent_cache.reducers import deep_learning
-
-        key_reducer = deep_learning.Reducer
-    return decorator.cache(function, key_reducer=key_reducer, cache_path=cache_path)
+cache = functools.partial(decorator.cache, deep_learning=True)

persistent_cache/caches/speedup_deep_learning.py

@@ -1,18 +1,5 @@
-from collections.abc import Callable
+import functools
 
 from persistent_cache.main import decorator
-from persistent_cache.models import F, Path
-from persistent_cache.reducers import Reducer
 
-
-def cache(
-    function: F | None = None,
-    *,
-    key_reducer: type[Reducer] | None = None,
-    cache_path: Path = Path.cache,
-) -> Callable[[F], F]:
-    if key_reducer is None:
-        from persistent_cache.reducers import speedup_deep_learning
-
-        key_reducer = speedup_deep_learning.Reducer
-    return decorator.cache(function, key_reducer=key_reducer, cache_path=cache_path)
+cache = functools.partial(decorator.cache, speedup_deep_learning=True)

persistent_cache/main/cacheslot.py

@@ -15,12 +15,11 @@ class CacheSlot(Generic[T]):
         self,
         function: Callable[..., T],
         args: tuple[Any, ...],
-        kwargs: Any,
         key_reducer: type[Reducer] = Reducer,
         cache_path: Path = Path.cache,
     ) -> None:
         # change cache key when implementation changes
-        cache_keys = (function, args, kwargs)
+        cache_keys = (function, args)
         self.location = (
             cache_path
             / function.__module__.replace(".", "_")

persistent_cache/main/decorator.py

@@ -1,4 +1,5 @@
-from collections.abc import Callable
+import inspect
+from collections.abc import Callable, Iterator
 from functools import wraps
 from typing import Any, cast, overload
 
@@ -12,8 +13,11 @@ from .cacheslot import CacheSlot
 def cache(
     function: F,
     *,
-    key_reducer: type[Reducer] = Reducer,
     cache_path: Path = Path.cache,
+    cache_key_arguments: tuple[str, ...] | str | None = None,
+    key_reducer: type[Reducer] = Reducer,
+    deep_learning: bool = False,
+    speedup_deep_learning: bool = False,
 ) -> F: ...
 
 
@@ -21,16 +25,22 @@ def cache(
 def cache(
     function: None = None,
     *,
-    key_reducer: type[Reducer] = Reducer,
     cache_path: Path = Path.cache,
+    cache_key_arguments: tuple[str, ...] | str | None = None,
+    key_reducer: type[Reducer] = Reducer,
+    deep_learning: bool = False,
+    speedup_deep_learning: bool = False,
 ) -> Callable[[F], F]: ...
 
 
-def cache(
+def cache(  # noqa: PLR0913
     function: F | None = None,
     *,
-    key_reducer: type[Reducer] = Reducer,
     cache_path: Path = Path.cache,
+    cache_key_arguments: tuple[str, ...] | str | None = None,
+    key_reducer: type[Reducer] | None = None,
+    deep_learning: bool = False,
+    speedup_deep_learning: bool = False,
 ) -> F | Callable[[F], F]:
     """A decorator to cache function results. Decorated functions are only executed if
     result is not present in cache. The arguments of the function can be any nested
@@ -45,10 +55,19 @@ def cache(
         ...
     """
 
+    reducer = extract_reducer(
+        key_reducer,
+        deep_learning=deep_learning,
+        speedup_deep_learning=speedup_deep_learning,
+    )
+
     def cache_decorator(function: F) -> F:
         @wraps(function)
         def wrapped_function(*args: Any, **kwargs: Any) -> Any:
-            cache_slot = CacheSlot(function, args, kwargs, key_reducer, cache_path)
+            arguments = tuple(
+                extract_argument_values(function, args, kwargs, cache_key_arguments),
+            )
+            cache_slot = CacheSlot(function, arguments, reducer, cache_path)
             try:
                 value = cache_slot.value
             except KeyError:
@@ -61,3 +80,43 @@ def cache(
     if function is not None:
         cache_decorator = cache_decorator(function)
     return cache_decorator
+
+
+def extract_argument_values(
+    function: F,
+    args: tuple[Any, ...],
+    kwargs: dict[str, Any],
+    cache_key_arguments: tuple[str, ...] | str | None = None,
+) -> Iterator[Any]:
+    if cache_key_arguments is None:
+        yield from (args, kwargs)
+    else:
+        arguments = inspect.signature(function).bind(*args, **kwargs)
+        arguments.apply_defaults()
+        if isinstance(cache_key_arguments, str):
+            yield arguments.arguments.get(cache_key_arguments)
+        else:
+            for name in cache_key_arguments:
+                yield arguments.arguments.get(name)
+
+
+def extract_reducer(
+    reducer: type[Reducer] | None,
+    *,
+    deep_learning: bool,
+    speedup_deep_learning: bool,
+) -> type[Reducer]:
+    if reducer is None:
+        if deep_learning:
+            from persistent_cache.reducers.deep_learning import Reducer as Reducer_
+
+            reducer = Reducer_
+        elif speedup_deep_learning:
+            from persistent_cache.reducers.speedup_deep_learning import (
+                Reducer as Reducer_,
+            )
+
+            reducer = Reducer_
+        else:
+            reducer = Reducer
+    return reducer

{persistent_function_cache-0.1.1.dist-info → persistent_function_cache-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: persistent-function-cache
-Version: 0.1.1
+Version: 0.2.0
 Summary: Persistent cache for expensive functions
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT

{persistent_function_cache-0.1.1.dist-info → persistent_function_cache-0.2.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 persistent_cache/__init__.py,sha256=VUq2BaLpsu66LXVBmRSBHGspctti2qavBqJNyja2yf8,91
 persistent_cache/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 persistent_cache/caches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-persistent_cache/caches/deep_learning.py,sha256=mFqdc72GylCrM6rDjN0gTt13xYQhDVOghdpF9htHL7o,545
-persistent_cache/caches/speedup_deep_learning.py,sha256=zebw9KM1JkOxQIFHEvc1iBwfzu0D3oX9N_u_FmdcHgQ,561
+persistent_cache/caches/deep_learning.py,sha256=tJQrRJK2Sbv7tIGwnrnFAn8nP-Fh7ZgugocKcXeiMnU,126
+persistent_cache/caches/speedup_deep_learning.py,sha256=bywNXeEZsg8Rs2A1_w-ZrJi9Ew2TvNCz59YryGyV0NI,134
 persistent_cache/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 persistent_cache/cli/clear_cache.py,sha256=YbKfqzUB9IyEpU-2n0h5BrK9kZKjbayqiMTzjPbDl3s,1541
 persistent_cache/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-persistent_cache/main/cacheslot.py,sha256=XIobyDDtMx1KpVxcz9dKo6-QEsFmK9Xej5j6dFieXk4,1246
-persistent_cache/main/decorator.py,sha256=ekRSAru2cRA6yU0rkpwzyQVnIw1qmW_kTCgSUSrm4nk,1572
+persistent_cache/main/cacheslot.py,sha256=6jNF6B1aEW185aPJ7Wd7tzLIOcwqyNr2p9tkxUHhk5E,1217
+persistent_cache/main/decorator.py,sha256=ojMDckrv5Fwhh8RvUCeZwQl06I1Q61olvs1HSz-jtVY,3457
 persistent_cache/main/hashing.py,sha256=YP_HO9nJe2_ZkiQf-unM6W9y_k5TJW1JvWeZfPIXtug,2650
 persistent_cache/models/__init__.py,sha256=No2WagrzFJdeQE3hTIeFd2H8hhvvAFcdVH6z07D1vmI,47
 persistent_cache/models/function.py,sha256=C1w0rVOhUkqvpPkXNj85rc4GSJDqT0oIZLsZvhVwn58,113
@@ -16,9 +16,9 @@ persistent_cache/reducers/__init__.py,sha256=hCozFuvrAb_gXLcqMMq92v4KdwBbQugwGwC
 persistent_cache/reducers/base.py,sha256=HsodcuE8Id5oV93_b_RN18I69UWsJ21yazXCwT1f6YU,1428
 persistent_cache/reducers/deep_learning.py,sha256=cyVolwmwm_ZN2gRxPtfJFqiNQlNuq_CrehO7ZSVWeVw,800
 persistent_cache/reducers/speedup_deep_learning.py,sha256=kMkr1467zUsQUPOi_N8tWKWAtKUcFgsk3rh94QhETg0,1970
-persistent_function_cache-0.1.1.dist-info/LICENSE,sha256=ENpNaBSvIV7ifD7iNz_-lBhImbiYowqPzBc5V5R8IhM,1070
-persistent_function_cache-0.1.1.dist-info/METADATA,sha256=XvGcWqgMSIS0u2b0zM9y5zxiW6KZ5h-Bkr-lG0ZhuHs,2164
-persistent_function_cache-0.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-persistent_function_cache-0.1.1.dist-info/entry_points.txt,sha256=fSZfuL6Wn42mZldojgGyg7dzSPCRVAuZox3w6dLd2ZI,88
-persistent_function_cache-0.1.1.dist-info/top_level.txt,sha256=Jj-Z9wxHRlRyDUxrfC9GeaV5-8hAf8R4LclQFZesxi8,17
-persistent_function_cache-0.1.1.dist-info/RECORD,,
+persistent_function_cache-0.2.0.dist-info/LICENSE,sha256=ENpNaBSvIV7ifD7iNz_-lBhImbiYowqPzBc5V5R8IhM,1070
+persistent_function_cache-0.2.0.dist-info/METADATA,sha256=thXWcG0Xy3rs1wV86vs7GcRcIYL8c_zAdwLitFoknNs,2164
+persistent_function_cache-0.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+persistent_function_cache-0.2.0.dist-info/entry_points.txt,sha256=fSZfuL6Wn42mZldojgGyg7dzSPCRVAuZox3w6dLd2ZI,88
+persistent_function_cache-0.2.0.dist-info/top_level.txt,sha256=Jj-Z9wxHRlRyDUxrfC9GeaV5-8hAf8R4LclQFZesxi8,17
+persistent_function_cache-0.2.0.dist-info/RECORD,,