persistent-function-cache 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

persistent_cache/cli/clear_cache.py

@@ -1,6 +1,6 @@
 import time
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from functools import cached_property
 from typing import Annotated
 
@@ -43,7 +43,7 @@ def main(options: Options) -> None:
             if options.verbose:
                 relative_path = path.relative_to(Options.cache_path)
                 timestamp = datetime.fromtimestamp(path.mtime).astimezone(
-                    tz=timezone.utc,
+                    tz=UTC,
                 )
                 message = f"{relative_path} ({timestamp})"
                 cli.console.print(message)

persistent_cache/main/cache_slot.py

@@ -87,11 +87,13 @@ class CacheSlot:
         if self.key_reducer is not None:
             return self.key_reducer
         if self.deep_learning:
-            from persistent_cache.reducers.deep_learning import Reducer as Reducer_
+            from persistent_cache.reducers.deep_learning import (  # noqa: PLC0415
+                Reducer as Reducer_,
+            )
 
             return Reducer_
         if self.speedup_deep_learning:
-            from persistent_cache.reducers.speedup_deep_learning import (
+            from persistent_cache.reducers.speedup_deep_learning import (  # noqa: PLC0415
                 Reducer as Reducer_,
             )
 

persistent_cache/main/decorator.py

@@ -84,7 +84,7 @@ def cache(  # noqa: PLR0913
                 cache_slot.value = result
             return result
 
-        return cast(F, wrapped_function)
+        return cast("F", wrapped_function)
 
     if function is not None:
         cache_decorator = cache_decorator(function)

persistent_cache/main/hashing.py

@@ -4,43 +4,30 @@ import hashlib
 import inspect
 import io
 import pickle
-from types import UnionType
-from typing import TYPE_CHECKING, Any, get_args, get_origin, get_type_hints
+from functools import cache
+from typing import TYPE_CHECKING, Any
 
-from persistent_cache.reducers.base import Reducer
+from package_utils.annotations import first_parameter_types
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator  # pragma: nocover
     from typing import BinaryIO  # pragma: nocover
 
+    from persistent_cache.reducers.base import Reducer  # pragma: nocover
 
-def extract_types(method: Callable[[Any], Any]) -> Iterator[type]:
-    type_hints = get_type_hints(method).values()
-    if type_hints:
-        argument_type = next(iter(type_hints))
-        origin = get_origin(argument_type)
-        arguments = get_args(argument_type)
-        if origin is UnionType:
-            yield from arguments
-        elif origin is not None:
-            yield origin
-        else:
-            yield argument_type
+
+def compute_hash(key_reducer: type[Reducer], items: Iterator[Any]) -> str:
+    with io.BytesIO() as fp:
+        HashPickler(fp, key_reducer).dump(tuple(items))
+        data = fp.getvalue()
+    # use fast hash function because it is not used for security
+    return hashlib.new("sha1", data=data, usedforsecurity=False).hexdigest()
 
 
 class HashPickler(pickle.Pickler):
-    def __init__(
-        self,
-        file_pointer: BinaryIO,
-        reducer: type[Reducer] = Reducer,
-    ) -> None:
+    def __init__(self, file_pointer: BinaryIO, reducer: type[Reducer]) -> None:
         super().__init__(file_pointer)
-        self.reducer = reducer
-        self.reducers = {}
-        for _, method in inspect.getmembers(reducer, predicate=inspect.ismethod):
-            argument_types = extract_types(method)
-            for argument_type in argument_types:
-                self.reducers[argument_type] = method
+        self.reducers = load_reducers(reducer)  # type: ignore[arg-type]
 
     def reducer_override(self, obj: Any) -> Any:
         """The goal of this pickler is to create hashes of complex objects, not to
@@ -49,32 +36,19 @@ class HashPickler(pickle.Pickler):
         So mapping does not need to be reversible.
         """
         reducer = next(self.determine_reducer(obj), None)
-        reduction: Any
-        if reducer is None:
-            reduction = NotImplemented
-        else:
-            mapping = reducer(obj)
-            str_mapping = str(item_to_bytes(self.reducer, mapping))
-            reduction = str, (str_mapping,)
-        return reduction
+        return NotImplemented if reducer is None else (tuple, (reducer(obj),))
 
     def determine_reducer(self, obj: Any) -> Iterator[Callable[[Any], Any]]:
-        if obj is not str:
+        if obj is not tuple:
             for obj_type, reducer in self.reducers.items():
                 if isinstance(obj, obj_type):
                     yield reducer
 
 
-def compute_hash(key_reducer: type[Reducer], items: Iterator[Any]) -> str:
-    data = item_to_bytes(key_reducer, tuple(items))
-    # use fast hash function because it is not used for security
-    return hashlib.new("sha1", data=data, usedforsecurity=False).hexdigest()
-
-
-def item_to_bytes(key_reducer: type[Reducer], item: Any) -> bytes:
-    with io.BytesIO() as fp:
-        # Use custom pickler to generate bytes from complex structures
-        pickler = HashPickler(fp, key_reducer)
-        pickler.dump(item)
-        fp.seek(0)
-        return fp.read()
+@cache
+def load_reducers(reducer: type[Reducer]) -> dict[type, Callable[[Any], Any]]:
+    return {
+        parameter_type: method
+        for _, method in inspect.getmembers(reducer, predicate=inspect.ismethod)
+        for parameter_type in first_parameter_types(method)
+    }

persistent_cache/models/path.py

@@ -1,4 +1,4 @@
-from typing import TypeVar, cast
+from typing import Self, TypeVar, cast
 
 import superpathlib
 from simple_classproperty import classproperty
@@ -9,11 +9,11 @@ T = TypeVar("T", bound="Path")
 class Path(superpathlib.Path):
     @classmethod
     @classproperty
-    def source_root(cls: type[T]) -> T:
+    def source_root(cls) -> Self:
         return cls(__file__).parent.parent
 
     @classmethod
     @classproperty
-    def cache(cls: type[T]) -> T:
+    def cache(cls) -> Self:
         path = cls.script_assets / cls.source_root.name
-        return cast(T, path)
+        return cast("Self", path)

persistent_cache/reducers/speedup_deep_learning.py

@@ -57,7 +57,3 @@ class Reducer(deep_learning.Reducer):
             label = None
 
         return length, data, label
-
-    @classmethod
-    def reduce_tensor(cls, tensor: torch.Tensor) -> NDArray[Any]:
-        return tensor.detach().cpu().numpy()

{persistent_function_cache-0.2.2.dist-info → persistent_function_cache-0.3.0.dist-info}/METADATA

@@ -1,26 +1,27 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: persistent-function-cache
-Version: 0.2.2
+Version: 0.3.0
 Summary: Persistent cache for expensive functions
 Author-email: Quinten Roets <qdr2104@columbia.edu>
-License: MIT
+License-Expression: MIT
 Project-URL: Source Code, https://github.com/quintenroets/persistent-cache
-Requires-Python: <3.13,>=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: package-utils<1,>=0.6.7
-Requires-Dist: powercli<1,>=0.3.2
-Requires-Dist: superpathlib<3,>=2.0.9
+Requires-Dist: package-utils<1,>=0.8.5
+Requires-Dist: powercli<1,>=0.4.0
+Requires-Dist: superpathlib<3,>=2.0.13
 Provides-Extra: dev
-Requires-Dist: package-dev-tools<1,>=0.5.11; extra == "dev"
+Requires-Dist: package-dev-tools<1,>=0.8.1; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 Requires-Dist: numpy<3,>=1.26.0; extra == "dev"
 Requires-Dist: torch<3,>=1.26.0; extra == "dev"
+Dynamic: license-file
 
 # Cache
 [![PyPI version](https://badge.fury.io/py/persistent-function-cache.svg)](https://badge.fury.io/py/persistent-function-cache)
 ![PyPI downloads](https://img.shields.io/pypi/dm/persistent-function-cache)
-![Python version](https://img.shields.io/badge/python-3.10--3.12-brightgreen)
+![Python version](https://img.shields.io/badge/python-3.11+-brightgreen)
 ![Operating system](https://img.shields.io/badge/os-linux%20%7c%20macOS%20%7c%20windows-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)
 

{persistent_function_cache-0.2.2.dist-info → persistent_function_cache-0.3.0.dist-info}/RECORD

@@ -4,20 +4,20 @@ persistent_cache/caches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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/cli/clear_cache.py,sha256=WlxwPo_ZUKMf45tNTFkwv92xVp777WXyGDq57OVIVTI,1527
 persistent_cache/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-persistent_cache/main/cache_slot.py,sha256=MmWBcz798QA8N6CPXXNxYmlGb3HwbG21NbbFcavH6eU,3265
-persistent_cache/main/decorator.py,sha256=lE_0q-KEavCe8IaK8hwuMUxH-tkN1_v-Jgy_dM_8Uxw,2684
-persistent_cache/main/hashing.py,sha256=6GYzUJcqjfjHPWMqPOCEY9FUSH2k2zUGrUza2fKaMTQ,2688
+persistent_cache/main/cache_slot.py,sha256=jL9lwbkVC-JqIDwYkMG9-6ZfXYYMQYhN7KGL4w7ldCM,3332
+persistent_cache/main/decorator.py,sha256=du8fn7MgJS4jqbfLK6Q0T2huHzpRCfNovky_WFh5DZs,2686
+persistent_cache/main/hashing.py,sha256=dzeCfLlg5Rk27XKnOIPBkJFGMu8hwM_cZvHEWePuKiE,1891
 persistent_cache/models/__init__.py,sha256=1OeLZ6FZ5gAjlerAjc69Vx0AqWLSx6OSqNCpuzkCZQg,23
-persistent_cache/models/path.py,sha256=-HRJ4yqqmBPlax4H0KS8guhndBXNwCnl7WZXhtaWmGQ,441
+persistent_cache/models/path.py,sha256=9HAYSB6sv7ac41Rpl1-9BYSDZrpoS_q5eNjUkivtr-w,440
 persistent_cache/reducers/__init__.py,sha256=hCozFuvrAb_gXLcqMMq92v4KdwBbQugwGwCmyLGt5RE,26
 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.2.2.dist-info/LICENSE,sha256=ENpNaBSvIV7ifD7iNz_-lBhImbiYowqPzBc5V5R8IhM,1070
-persistent_function_cache-0.2.2.dist-info/METADATA,sha256=PoI9EMIFqiZ21RHpHKNctkbdhu7h0LdHWD7TS-8_Krc,2164
-persistent_function_cache-0.2.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-persistent_function_cache-0.2.2.dist-info/entry_points.txt,sha256=fSZfuL6Wn42mZldojgGyg7dzSPCRVAuZox3w6dLd2ZI,88
-persistent_function_cache-0.2.2.dist-info/top_level.txt,sha256=Jj-Z9wxHRlRyDUxrfC9GeaV5-8hAf8R4LclQFZesxi8,17
-persistent_function_cache-0.2.2.dist-info/RECORD,,
+persistent_cache/reducers/speedup_deep_learning.py,sha256=-kBazhXzPuDpu2CLzw8F2kFyunA1z_H0qU9lW6771y0,1841
+persistent_function_cache-0.3.0.dist-info/licenses/LICENSE,sha256=ENpNaBSvIV7ifD7iNz_-lBhImbiYowqPzBc5V5R8IhM,1070
+persistent_function_cache-0.3.0.dist-info/METADATA,sha256=RVklXJbtkZe5MCd1Xe6CDX7WnpuPbUE4k6PYNptX8I4,2186
+persistent_function_cache-0.3.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+persistent_function_cache-0.3.0.dist-info/entry_points.txt,sha256=fSZfuL6Wn42mZldojgGyg7dzSPCRVAuZox3w6dLd2ZI,88
+persistent_function_cache-0.3.0.dist-info/top_level.txt,sha256=Jj-Z9wxHRlRyDUxrfC9GeaV5-8hAf8R4LclQFZesxi8,17
+persistent_function_cache-0.3.0.dist-info/RECORD,,

{persistent_function_cache-0.2.2.dist-info → persistent_function_cache-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any