pickle-debug 1.1__tar.gz → 1.2__tar.gz

{pickle_debug-1.1/src/pickle_debug.egg-info → pickle_debug-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pickle_debug
-Version: 1.1
+Version: 1.2
 Summary: Store expensive objects from debugging
 Author: Gerard
 Author-email: gweatherby@uchc.edu

{pickle_debug-1.1 → pickle_debug-1.2}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "pickle_debug"
 description = "Store expensive objects from debugging"
 license = {text = "MIT" }
-version = "1.1"
+version = "1.2"
 dependencies = []
 requires-python= ">= 3.12"
 readme = "README.md"

{pickle_debug-1.1 → pickle_debug-1.2}/src/pickle_debug/__init__.py

@@ -116,15 +116,32 @@ def _save(path: Path, result: Any) -> None:
         raise
 
 
+def _is_method_receiver(obj: Any, name: str, wrapper: Callable) -> bool:
+    """True if obj is the self or cls that wrapper was called through as a method"""
+    cls = obj if isinstance(obj, type) else type(obj)
+    for klass in cls.__mro__:
+        attr = vars(klass).get(name)
+        if isinstance(attr, classmethod):
+            attr = attr.__func__
+        if attr is wrapper:
+            return True
+    return False
+
+
 def cached(func: Callable) -> Callable:
-    """Decorator: cache result of func in directory set by enable(), keyed by arguments"""
+    """Decorator: cache result of func in directory set by enable(), keyed by arguments.
+    When used on a method, self (or cls) is keyed by its class name rather than its current value"""
 
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         directory = _CACHE_DIRECTORY
         if directory is None:
             return func(*args, **kwargs)
-        key = _dumps((func.__module__, func.__qualname__, args, sorted(kwargs.items())))
+        key_args = args
+        if args and _is_method_receiver(args[0], func.__name__, wrapper):
+            cls = args[0] if isinstance(args[0], type) else type(args[0])
+            key_args = (f"{cls.__module__}.{cls.__qualname__}",) + args[1:]
+        key = _dumps((func.__module__, func.__qualname__, key_args, sorted(kwargs.items())))
         path = directory / (hashlib.sha256(key).hexdigest() + _SUFFIX)
         try:
             with open(path, 'rb') as f:
@@ -140,3 +157,18 @@ def cached(func: Callable) -> Callable:
         return result
 
     return wrapper
+
+def record(name:str,fn,*args,**kwargs):
+    p = None
+    if _CACHE_DIRECTORY is not None:
+        p = _CACHE_DIRECTORY / f"{name}.pickle"
+        if p.is_file():
+            with open(p,'rb') as f:
+                result = pickle.load(f)
+                return result
+    result = fn(*args,**kwargs)
+    if p is not None: 
+        with open(p,'wb') as f:
+            pickle.dump(result,f)
+    return result
+

{pickle_debug-1.1 → pickle_debug-1.2/src/pickle_debug.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pickle_debug
-Version: 1.1
+Version: 1.2
 Summary: Store expensive objects from debugging
 Author: Gerard
 Author-email: gweatherby@uchc.edu

{pickle_debug-1.1 → pickle_debug-1.2}/src/pickle_debug.egg-info/SOURCES.txt

@@ -8,5 +8,6 @@ src/pickle_debug.egg-info/dependency_links.txt
 src/pickle_debug.egg-info/top_level.txt
 src/test/patch_test.py
 src/test/pd_test.py
+src/test/record.py
 src/test/ttest.py
 src/test/unpicklable_test.py

pickle_debug-1.2/src/test/record.py

@@ -0,0 +1,11 @@
+import pickle_debug
+
+def sum(x,y):
+    print(f"{x} + {y}")
+    return x + y
+
+pickle_debug.enable("/tmp/sum")
+ans = pickle_debug.record("sum",sum,3,4)
+print(ans)
+ans = pickle_debug.record("sum",sum,3,4)
+print(ans)