checkpointer 2.6.0__py3-none-any.whl → 2.6.1__py3-none-any.whl

checkpointer/checkpoint.py

@@ -22,10 +22,11 @@ class CheckpointerOpts(TypedDict, total=False):
   format: Type[Storage] | Literal["pickle", "memory", "bcolz"]
   root_path: Path | str | None
   when: bool
-  verbosity: Literal[0, 1]
+  verbosity: Literal[0, 1, 2]
   hash_by: Callable | None
   should_expire: Callable[[datetime], bool] | None
   capture: bool
+  fn_hash: str | None
 
 class Checkpointer:
   def __init__(self, **opts: Unpack[CheckpointerOpts]):
@@ -36,6 +37,7 @@ class Checkpointer:
     self.hash_by = opts.get("hash_by")
     self.should_expire = opts.get("should_expire")
     self.capture = opts.get("capture", False)
+    self.fn_hash = opts.get("fn_hash")
 
   @overload
   def __call__(self, fn: Fn, **override_opts: Unpack[CheckpointerOpts]) -> CheckpointFn[Fn]: ...
@@ -66,9 +68,9 @@ class CheckpointFn(Generic[Fn]):
     store_format = self.checkpointer.format
     Storage = STORAGE_MAP[store_format] if isinstance(store_format, str) else store_format
     deep_hashes = [child._set_ident().fn_hash_raw for child in iterate_checkpoint_fns(self)]
-    self.fn_hash = str(ObjectHash().write_text(self.fn_hash_raw, iter=deep_hashes))
+    self.fn_hash = self.checkpointer.fn_hash or str(ObjectHash().write_text(self.fn_hash_raw, *deep_hashes))
     self.fn_subdir = f"{fn_file}/{fn_name}/{self.fn_hash[:16]}"
-    self.is_async = inspect.iscoroutinefunction(wrapped)
+    self.is_async: bool = self.fn.is_async if isinstance(self.fn, CheckpointFn) else inspect.iscoroutinefunction(self.fn)
     self.storage = Storage(self)
     self.cleanup = self.storage.cleanup
 
@@ -80,12 +82,13 @@ class CheckpointFn(Generic[Fn]):
     self._lazyinit()
     return self._getattribute(name)
 
-  def reinit(self, recursive=False):
+  def reinit(self, recursive=False) -> CheckpointFn[Fn]:
     pointfns = list(iterate_checkpoint_fns(self)) if recursive else [self]
     for pointfn in pointfns:
       pointfn._set_ident(True)
     for pointfn in pointfns:
       pointfn._lazyinit()
+    return self
 
   def get_checkpoint_id(self, args: tuple, kw: dict) -> str:
     hash_params = [self.checkpointer.hash_by(*args, **kw)] if self.checkpointer.hash_by else (args, kw)
@@ -95,13 +98,13 @@ class CheckpointFn(Generic[Fn]):
   async def _store_on_demand(self, args: tuple, kw: dict, rerun: bool):
     checkpoint_id = self.get_checkpoint_id(args, kw)
     checkpoint_path = self.checkpointer.root_path / checkpoint_id
-    verbose = self.checkpointer.verbosity > 0
+    verbosity = self.checkpointer.verbosity
     refresh = rerun \
       or not self.storage.exists(checkpoint_path) \
       or (self.checkpointer.should_expire and self.checkpointer.should_expire(self.storage.checkpoint_date(checkpoint_path)))
 
     if refresh:
-      print_checkpoint(verbose, "MEMORIZING", checkpoint_id, "blue")
+      print_checkpoint(verbosity >= 1, "MEMORIZING", checkpoint_id, "blue")
       data = self.fn(*args, **kw)
       if inspect.iscoroutine(data):
         data = await data
@@ -110,11 +113,11 @@ class CheckpointFn(Generic[Fn]):
 
     try:
       data = self.storage.load(checkpoint_path)
-      print_checkpoint(verbose, "REMEMBERED", checkpoint_id, "green")
+      print_checkpoint(verbosity >= 2, "REMEMBERED", checkpoint_id, "green")
       return data
     except (EOFError, FileNotFoundError):
       pass
-    print_checkpoint(verbose, "CORRUPTED", checkpoint_id, "yellow")
+    print_checkpoint(verbosity >= 1, "CORRUPTED", checkpoint_id, "yellow")
     return await self._store_on_demand(args, kw, True)
 
   def _call(self, args: tuple, kw: dict, rerun=False):

checkpointer/fn_ident.py

@@ -4,7 +4,7 @@ from collections.abc import Callable
 from itertools import takewhile
 from pathlib import Path
 from types import CodeType, FunctionType, MethodType
-from typing import Any, Generator, Type, TypeGuard
+from typing import Any, Iterable, Type, TypeGuard
 from .object_hash import ObjectHash
 from .utils import AttrDict, distinct, get_cell_contents, iterate_and_upcoming, transpose, unwrap_fn
 
@@ -33,7 +33,7 @@ def extract_classvars(code: CodeType, scope_vars: AttrDict) -> dict[str, dict[st
       scope_obj = None
   return classvars
 
-def extract_scope_values(code: CodeType, scope_vars: AttrDict) -> Generator[tuple[tuple[str, ...], Any], None, None]:
+def extract_scope_values(code: CodeType, scope_vars: AttrDict) -> Iterable[tuple[tuple[str, ...], Any]]:
   classvars = extract_classvars(code, scope_vars)
   scope_vars = scope_vars.set({k: scope_vars[k].set(v) for k, v in classvars.items()})
   for instr, upcoming_instrs in iterate_and_upcoming(dis.get_instructions(code)):

checkpointer/storages/pickle_storage.py

@@ -18,6 +18,7 @@ class PickleStorage(Storage):
     return get_path(path).exists()
 
   def checkpoint_date(self, path):
+    # Should use st_atime/access time?
     return datetime.fromtimestamp(get_path(path).stat().st_mtime)
 
   def load(self, path):

checkpointer/utils.py

@@ -23,7 +23,7 @@ def get_fn_body(fn: Callable) -> str:
   ignore_types = (tokenize.COMMENT, tokenize.NL)
   return "".join("\0" + token.string for token in tokens if token.type not in ignore_types)
 
-def get_cell_contents(fn: Callable) -> Generator[tuple[str, Any], None, None]:
+def get_cell_contents(fn: Callable) -> Iterable[tuple[str, Any]]:
   for key, cell in zip(fn.__code__.co_freevars, fn.__closure__ or []):
     try:
       yield (key, cell.cell_contents)

{checkpointer-2.6.0.dist-info → checkpointer-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: checkpointer
-Version: 2.6.0
+Version: 2.6.1
 Summary: A Python library for memoizing function results with support for multiple storage backends, async runtimes, and automatic cache invalidation
 Project-URL: Repository, https://github.com/Reddan/checkpointer.git
 Author: Hampus Hallman
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 
-# checkpointer · [![License](https://img.shields.io/badge/license-MIT-blue)](https://github.com/Reddan/checkpointer/blob/master/LICENSE) [![pypi](https://img.shields.io/pypi/v/checkpointer)](https://pypi.org/project/checkpointer/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue)](https://pypi.org/project/checkpointer/)
+# checkpointer · [![License](https://img.shields.io/badge/license-MIT-blue)](https://github.com/Reddan/checkpointer/blob/master/LICENSE) [![pypi](https://img.shields.io/pypi/v/checkpointer)](https://pypi.org/project/checkpointer/) [![pypi](https://img.shields.io/pypi/pyversions/checkpointer)](https://pypi.org/project/checkpointer/)
 
 `checkpointer` is a Python library for memoizing function results. It provides a decorator-based API with support for multiple storage backends. Use it for computationally expensive operations where caching can save time, or during development to avoid waiting for redundant computations.
 
@@ -225,7 +225,7 @@ Use a custom backend to integrate with databases, cloud storage, or specialized
 | `format`        | `"pickle"`, `"memory"`, `Storage`   | `"pickle"`           | Storage backend format.                                   |
 | `root_path`     | `Path`, `str`, or `None`            | ~/.cache/checkpoints | Root directory for storing checkpoints.                   |
 | `when`          | `bool`                              | `True`               | Enable or disable checkpointing.                          |
-| `verbosity`     | `0` or `1`                          | `1`                  | Logging verbosity.                                        |
+| `verbosity`     | `0`, `1` or `2`                     | `1`                  | Logging verbosity.                                        |
 | `should_expire` | `Callable[[datetime], bool]`        | `None`               | Custom expiration logic.                                  |
 | `hash_by`       | `Callable[..., Any]`                | `None`               | Custom function that transforms arguments before hashing. |
 

{checkpointer-2.6.0.dist-info → checkpointer-2.6.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
 checkpointer/__init__.py,sha256=ZJ6frUNgkklUi85b5uXTyTfRzMvZgQOJY-ZOnu7jh78,777
-checkpointer/checkpoint.py,sha256=2CAlNPnMLeou8SwHWeIjJ4kQhSqnpM9EBP_f-cYdSlE,6123
-checkpointer/fn_ident.py,sha256=TEM_SdjzQ5OgRJnqNgyYZZKONx7tM7Dk4bNM5TB_RyY,4311
+checkpointer/checkpoint.py,sha256=3ohNeAqzZLCT9IHJ7nsDbtZ8rjI0rdApbqp8KowDRtc,6332
+checkpointer/fn_ident.py,sha256=SWaksNCTlskMom0ztqjECSRjZYPWXUA1p1ZCb-9tWo0,4297
 checkpointer/object_hash.py,sha256=o7Qr9VViWPmG1Fy1S3RediCagRydEVgTVZrZ9nRN54E,7215
 checkpointer/print_checkpoint.py,sha256=21aeqgM9CMjNAJyScqFmXCWWfh3jBIn7o7i5zJkZGaA,1369
 checkpointer/test_checkpointer.py,sha256=uJ2Pg9Miq1W0l28eNlRhMjuT_R8c-ygYwp3KP3VW8Os,3600
-checkpointer/utils.py,sha256=Rvm2NaJHtPTusM7fyHz_w9HUy_fqQfx8S1fr5CBWGL0,3047
+checkpointer/utils.py,sha256=w1cAoKAERPIaJ1pYYINCTZWOgNTtCYa1_FTzeG5qh10,3034
 checkpointer/storages/__init__.py,sha256=Kl4Og5jhYxn6m3tB_kTMsabf4_eWVLmFVAoC-pikNQE,301
 checkpointer/storages/bcolz_storage.py,sha256=3QkSUSeG5s2kFuVV_LZpzMn1A5E7kqC7jk7w35c0NyQ,2314
 checkpointer/storages/memory_storage.py,sha256=S5ayOZE_CyaFQJ-vSgObTanldPzG3gh3NksjNAc7vsk,1282
-checkpointer/storages/pickle_storage.py,sha256=lJ0ton9ib3eifiny8XtPSNsx-w4Cm8oYUlbmKob34xU,1554
+checkpointer/storages/pickle_storage.py,sha256=idh9sBMdWuyvS220oa_7bAUpc9Xo9v6Ud9aYKGWasUs,1593
 checkpointer/storages/storage.py,sha256=_m18Z8TKrdAbi6YYYQmuNOnhna4RB2sJDn1v3liaU3U,721
-checkpointer-2.6.0.dist-info/METADATA,sha256=RWzn1RNHN76iF4hNkomVLouWvtjHtOody5doC4ajRk8,10556
-checkpointer-2.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-checkpointer-2.6.0.dist-info/licenses/LICENSE,sha256=9xVsdtv_-uSyY9Xl9yujwAPm4-mjcCLeVy-ljwXEWbo,1059
-checkpointer-2.6.0.dist-info/RECORD,,
+checkpointer-2.6.1.dist-info/METADATA,sha256=9RHScS2NKtNjtILIvcf5LEcjbA-BzvLyTN6L8WH_usE,10555
+checkpointer-2.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+checkpointer-2.6.1.dist-info/licenses/LICENSE,sha256=9xVsdtv_-uSyY9Xl9yujwAPm4-mjcCLeVy-ljwXEWbo,1059
+checkpointer-2.6.1.dist-info/RECORD,,