checkpointer 2.6.2__py3-none-any.whl → 2.7.0__py3-none-any.whl

checkpointer/checkpoint.py

@@ -26,7 +26,7 @@ class CheckpointerOpts(TypedDict, total=False):
   hash_by: Callable | None
   should_expire: Callable[[datetime], bool] | None
   capture: bool
-  fn_hash: str | None
+  fn_hash: ObjectHash | None
 
 class Checkpointer:
   def __init__(self, **opts: Unpack[CheckpointerOpts]):
@@ -61,14 +61,14 @@ class CheckpointFn(Generic[Fn]):
     return self
 
   def _lazyinit(self):
+    params = self.checkpointer
     wrapped = unwrap_fn(self.fn)
     fn_file = Path(wrapped.__code__.co_filename).name
     fn_name = re.sub(r"[^\w.]", "", wrapped.__qualname__)
     update_wrapper(cast(Callable, self), wrapped)
-    store_format = self.checkpointer.format
-    Storage = STORAGE_MAP[store_format] if isinstance(store_format, str) else store_format
+    Storage = STORAGE_MAP[params.format] if isinstance(params.format, str) else params.format
     deep_hashes = [child._set_ident().fn_hash_raw for child in iterate_checkpoint_fns(self)]
-    self.fn_hash = self.checkpointer.fn_hash or str(ObjectHash().write_text(self.fn_hash_raw, *deep_hashes))
+    self.fn_hash = str(params.fn_hash or ObjectHash().write_text(self.fn_hash_raw, *deep_hashes))
     self.fn_subdir = f"{fn_file}/{fn_name}/{self.fn_hash[:16]}"
     self.is_async: bool = self.fn.is_async if isinstance(self.fn, CheckpointFn) else inspect.iscoroutinefunction(self.fn)
     self.storage = Storage(self)
@@ -91,20 +91,21 @@ class CheckpointFn(Generic[Fn]):
     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)
-    call_hash = ObjectHash(self.fn_hash, *hash_params, digest_size=16)
+    hash_by = self.checkpointer.hash_by
+    hash_params = hash_by(*args, **kw) if hash_by else (args, kw)
+    call_hash = ObjectHash(hash_params, digest_size=16)
     return f"{self.fn_subdir}/{call_hash}"
 
   async def _store_on_demand(self, args: tuple, kw: dict, rerun: bool):
+    params = self.checkpointer
     checkpoint_id = self.get_checkpoint_id(args, kw)
-    checkpoint_path = self.checkpointer.root_path / checkpoint_id
-    verbosity = self.checkpointer.verbosity
+    checkpoint_path = params.root_path / checkpoint_id
     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)))
+      or (params.should_expire and params.should_expire(self.storage.checkpoint_date(checkpoint_path)))
 
     if refresh:
-      print_checkpoint(verbosity >= 1, "MEMORIZING", checkpoint_id, "blue")
+      print_checkpoint(params.verbosity >= 1, "MEMORIZING", checkpoint_id, "blue")
       data = self.fn(*args, **kw)
       if inspect.iscoroutine(data):
         data = await data
@@ -113,11 +114,11 @@ class CheckpointFn(Generic[Fn]):
 
     try:
       data = self.storage.load(checkpoint_path)
-      print_checkpoint(verbosity >= 2, "REMEMBERED", checkpoint_id, "green")
+      print_checkpoint(params.verbosity >= 2, "REMEMBERED", checkpoint_id, "green")
       return data
     except (EOFError, FileNotFoundError):
       pass
-    print_checkpoint(verbosity >= 1, "CORRUPTED", checkpoint_id, "yellow")
+    print_checkpoint(params.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-2.6.2.dist-info → checkpointer-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: checkpointer
-Version: 2.6.2
+Version: 2.7.0
 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

{checkpointer-2.6.2.dist-info → checkpointer-2.7.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 checkpointer/__init__.py,sha256=ZJ6frUNgkklUi85b5uXTyTfRzMvZgQOJY-ZOnu7jh78,777
-checkpointer/checkpoint.py,sha256=3ohNeAqzZLCT9IHJ7nsDbtZ8rjI0rdApbqp8KowDRtc,6332
+checkpointer/checkpoint.py,sha256=NmspwYKHbhaTMElENXR3TREzvhaXYfmuz_rQJsLUtpA,6280
 checkpointer/fn_ident.py,sha256=SWaksNCTlskMom0ztqjECSRjZYPWXUA1p1ZCb-9tWo0,4297
 checkpointer/object_hash.py,sha256=rcHzVYZAeygLyqeKv1NODIDp0M_knLuDZefcBV_7ln4,7371
 checkpointer/print_checkpoint.py,sha256=aJCeWMRJiIR3KpyPk_UOKTaD906kArGrmLGQ3LqcVgo,1369
@@ -10,7 +10,7 @@ checkpointer/storages/bcolz_storage.py,sha256=3QkSUSeG5s2kFuVV_LZpzMn1A5E7kqC7jk
 checkpointer/storages/memory_storage.py,sha256=S5ayOZE_CyaFQJ-vSgObTanldPzG3gh3NksjNAc7vsk,1282
 checkpointer/storages/pickle_storage.py,sha256=idh9sBMdWuyvS220oa_7bAUpc9Xo9v6Ud9aYKGWasUs,1593
 checkpointer/storages/storage.py,sha256=_m18Z8TKrdAbi6YYYQmuNOnhna4RB2sJDn1v3liaU3U,721
-checkpointer-2.6.2.dist-info/METADATA,sha256=fpt1kQbTghSeSIbDranjL0-iGYaA3LbWFlyAfSTgJB0,10606
-checkpointer-2.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-checkpointer-2.6.2.dist-info/licenses/LICENSE,sha256=9xVsdtv_-uSyY9Xl9yujwAPm4-mjcCLeVy-ljwXEWbo,1059
-checkpointer-2.6.2.dist-info/RECORD,,
+checkpointer-2.7.0.dist-info/METADATA,sha256=ANOUJpdq3OXaF_d9jMBP0rWlpIOq0c4Z2uVKjXf_YnE,10606
+checkpointer-2.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+checkpointer-2.7.0.dist-info/licenses/LICENSE,sha256=9xVsdtv_-uSyY9Xl9yujwAPm4-mjcCLeVy-ljwXEWbo,1059
+checkpointer-2.7.0.dist-info/RECORD,,