checkpointer 2.14.1__py3-none-any.whl → 2.14.2__py3-none-any.whl

checkpointer/checkpoint.py

@@ -241,6 +241,16 @@ class CachedFunction(Generic[Fn]):
     except Exception as ex:
       raise CheckpointError("Could not load checkpoint") from ex
 
+  @overload
+  def get_or(self: Callable[P, Coro[R]], default: R, *args: P.args, **kw: P.kwargs) -> R: ...
+  @overload
+  def get_or(self: Callable[P, R], default: R, *args: P.args, **kw: P.kwargs) -> R: ...
+  def get_or(self, default, *args, **kw):
+    try:
+      return self.get(*args, **kw)  # type: ignore
+    except CheckpointError:
+      return default
+
   @overload
   def set(self: Callable[P, Coro[R]], value: AwaitableValue[R], *args: P.args, **kw: P.kwargs): ...
   @overload

checkpointer/storages/pickle_storage.py

@@ -2,22 +2,12 @@ import pickle
 import shutil
 from datetime import datetime
 from pathlib import Path
+from ..utils import clear_directory
 from .storage import Storage
 
 def filedate(path: Path) -> datetime:
   return datetime.fromtimestamp(path.stat().st_mtime)
 
-def empty_dirs(path: Path):
-  nonempty_count = 0
-  for child in path.iterdir():
-    nonempty_count += 1
-    if child.is_dir():
-      for grand_child in empty_dirs(child):
-        yield grand_child
-        nonempty_count -= child == grand_child
-  if nonempty_count == 0:
-    yield path
-
 class PickleStorage(Storage):
   def get_path(self, call_hash: str):
     return self.fn_dir() / f"{call_hash[:2]}/{call_hash[2:]}.pkl"
@@ -58,11 +48,7 @@ class PickleStorage(Storage):
           count += 1
           pkl_path.unlink(missing_ok=True)
       print(f"Removed {count} expired checkpoints for {self.cached_fn.__qualname__}")
-    if fn_path.exists():
-      for file in fn_path.glob("**/.DS_Store"):
-        file.unlink()
-      for directory in empty_dirs(fn_path):
-        directory.rmdir()
+    clear_directory(fn_path)
 
   def clear(self):
     fn_path = self.fn_dir().parent

checkpointer/utils.py

@@ -112,3 +112,21 @@ class ContextVar(Generic[T]):
       yield
     finally:
       self.value = old
+
+def empty_dirs(path: Path) -> Iterable[Path]:
+  nonempty_count = 0
+  for child in path.iterdir():
+    nonempty_count += 1
+    if child.is_dir():
+      for grand_child in empty_dirs(child):
+        yield grand_child
+        nonempty_count -= child == grand_child
+  if nonempty_count == 0:
+    yield path
+
+def clear_directory(path: Path):
+  if path.is_dir():
+    for file in path.glob("**/.DS_Store"):
+      file.unlink()
+    for directory in empty_dirs(path):
+      directory.rmdir()

{checkpointer-2.14.1.dist-info → checkpointer-2.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: checkpointer
-Version: 2.14.1
+Version: 2.14.2
 Summary: checkpointer adds code-aware caching to Python functions, maintaining correctness and speeding up execution as your code changes.
 Project-URL: Repository, https://github.com/Reddan/checkpointer.git
 Author: Hampus Hallman

{checkpointer-2.14.1.dist-info → checkpointer-2.14.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 checkpointer/__init__.py,sha256=mT706hd-BoTpQXYH_MiqreplONVDvjCWjwwGQ7oRe_8,921
-checkpointer/checkpoint.py,sha256=SUHu5ADRtSrapspk2DpBLaYnAQ7yuTc05lUELig_Tpc,9972
+checkpointer/checkpoint.py,sha256=FajtvHHfV3TkbD5fxYq0F1TdiJLWH1eZJUybyPrxAXQ,10330
 checkpointer/fn_ident.py,sha256=Z2HtkoG8n0ddqNzjejnKW6Lo-ID2unKQZa1tOpRGujs,6911
 checkpointer/fn_string.py,sha256=YldjAU91cwiZNwuE_AQN_DMiQCPAhGiiC3lPi0uvM0g,2579
 checkpointer/import_mappings.py,sha256=ESqWvZTzYAmaVnJ6NulUvn3_8CInOOPmEKUXO2WD_WA,1794
 checkpointer/object_hash.py,sha256=_VgyTEoe3H6268KBAOFZxSgWHb6otgG-3NzhHyehxe4,8595
 checkpointer/print_checkpoint.py,sha256=uUQ493fJCaB4nhp4Ox60govSCiBTIPbBX15zt2QiRGo,1356
 checkpointer/types.py,sha256=GFqbGACdDxzQX3bb2LmF9UxQVWOEisGvdtobnqCBAOA,1129
-checkpointer/utils.py,sha256=CF28pGytCWV4URhRDFaIDawX8qmCAAByQp0ZkEwrA6c,3014
+checkpointer/utils.py,sha256=o9RCyUmVL8fUenwQ3VBZ80764cs7lQzbeQ9ZhP5bZ-I,3498
 checkpointer/storages/__init__.py,sha256=p-r4YrPXn505_S3qLrSXHSlsEtb13w_DFnCt9IiUomk,296
 checkpointer/storages/memory_storage.py,sha256=1YHZU-WSqvLA_0og53UZY141ziDgnaBub2mDjDaeAj8,1261
-checkpointer/storages/pickle_storage.py,sha256=PwFbCqYHjR3jiWuTnwxCU9cui7CINvq0wXIOKtf8dOk,2230
+checkpointer/storages/pickle_storage.py,sha256=hgvQN4C0OB--uly6TIGZVaU_AFkjElbAoKjW_skxliA,1844
 checkpointer/storages/storage.py,sha256=JVxdq1DMhbq83bvflvIuW7okE1CQCa7poQPsj3x0ACg,1366
-checkpointer-2.14.1.dist-info/METADATA,sha256=KupseJCcWRNym_Ckit_F-oGLPIgqUsyKJvjl6ekEDZU,11215
-checkpointer-2.14.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-checkpointer-2.14.1.dist-info/licenses/ATTRIBUTION.md,sha256=WF6L7-sD4s9t9ytVJOhjhpDoZ6TrWpqE3_bMdDIeJxI,1078
-checkpointer-2.14.1.dist-info/licenses/LICENSE,sha256=drXs6vIb7uW49r70UuMz2A1VtOCl626kiTbcmrar1Xo,1072
-checkpointer-2.14.1.dist-info/RECORD,,
+checkpointer-2.14.2.dist-info/METADATA,sha256=ttVoBFscpAup79wZytwM4hCf0aqDAMWjjhEpQD8oiOY,11215
+checkpointer-2.14.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+checkpointer-2.14.2.dist-info/licenses/ATTRIBUTION.md,sha256=WF6L7-sD4s9t9ytVJOhjhpDoZ6TrWpqE3_bMdDIeJxI,1078
+checkpointer-2.14.2.dist-info/licenses/LICENSE,sha256=drXs6vIb7uW49r70UuMz2A1VtOCl626kiTbcmrar1Xo,1072
+checkpointer-2.14.2.dist-info/RECORD,,