thds.core 1.44.20250730010425__py3-none-any.whl → 1.44.20250730172116__py3-none-any.whl

thds/core/cache.py

@@ -12,7 +12,7 @@ else:  # pragma: no cover
     from typing_extensions import ParamSpec
 
 
-class _HashedTuple(tuple):
+class HashedTuple(tuple):
     """A tuple that ensures that `hash` will be called no more than once
     per element, since cache decorators will hash the key multiple
     times on a cache miss.  See also `_HashedSeq` in the standard
@@ -27,11 +27,11 @@ class _HashedTuple(tuple):
             self.__hashvalue = hashvalue = hash(self)
         return hashvalue
 
-    def __add__(self, other, add=tuple.__add__) -> "_HashedTuple":
-        return _HashedTuple(add(self, other))
+    def __add__(self, other, add=tuple.__add__) -> "HashedTuple":
+        return HashedTuple(add(self, other))
 
-    def __radd__(self, other, add=tuple.__add__) -> "_HashedTuple":
-        return _HashedTuple(add(other, self))
+    def __radd__(self, other, add=tuple.__add__) -> "HashedTuple":
+        return HashedTuple(add(other, self))
 
     def __getstate__(self) -> ty.Dict:
         return {}
@@ -39,23 +39,23 @@ class _HashedTuple(tuple):
 
 # used for separating keyword arguments; we do not use an object
 # instance here so identity is preserved when pickling/unpickling
-_kwmark = (_HashedTuple,)
+_kwmark = (HashedTuple,)
 
 
-def hashkey(args: tuple, kwargs: ty.Mapping) -> _HashedTuple:
+def hashkey(args: tuple, kwargs: ty.Mapping) -> HashedTuple:
     """Return a cache key for the specified hashable arguments."""
 
     if kwargs:
-        return _HashedTuple(args + sum(sorted(kwargs.items()), _kwmark))
+        return HashedTuple(args + sum(sorted(kwargs.items()), _kwmark))
     else:
-        return _HashedTuple(args)
+        return HashedTuple(args)
 
 
 # above keying code borrowed from `cachetools`: https://github.com/tkem/cachetools/tree/master
 # I have added some type information
 
 
-def make_bound_hashkey(func: ty.Callable) -> ty.Callable[..., _HashedTuple]:
+def make_bound_hashkey(func: ty.Callable) -> ty.Callable[..., HashedTuple]:
     """Makes a hashkey function that binds its `*args, **kwargs` to the function signature of `func`.
 
     The resulting bound hashkey function makes cache keys that are robust to variations in how arguments are passed to
@@ -63,7 +63,7 @@ def make_bound_hashkey(func: ty.Callable) -> ty.Callable[..., _HashedTuple]:
     """
     signature = inspect.signature(func)
 
-    def bound_hashkey(args: tuple, kwargs: ty.Mapping) -> _HashedTuple:
+    def bound_hashkey(args: tuple, kwargs: ty.Mapping) -> HashedTuple:
         bound_arguments = signature.bind(*args, **kwargs)
         bound_arguments.apply_defaults()
         return hashkey(bound_arguments.args, bound_arguments.kwargs)
@@ -85,11 +85,11 @@ _R = ty.TypeVar("_R")
 
 def _locking_factory(
     cache_lock: proto.ContextManager,
-    make_func_lock: ty.Callable[[_HashedTuple], proto.ContextManager],
+    make_func_lock: ty.Callable[[HashedTuple], proto.ContextManager],
 ) -> ty.Callable[[ty.Callable[_P, _R]], ty.Callable[_P, _R]]:
     def decorator(func: ty.Callable[_P, _R]) -> ty.Callable[_P, _R]:
-        cache: ty.Dict[_HashedTuple, _R] = {}
-        keys_to_func_locks: ty.Dict[_HashedTuple, proto.ContextManager] = {}
+        cache: ty.Dict[HashedTuple, _R] = {}
+        keys_to_func_locks: ty.Dict[HashedTuple, proto.ContextManager] = {}
         hits = misses = 0
         bound_hashkey = make_bound_hashkey(func)
         sentinel = ty.cast(_R, object())  # unique object used to signal cache misses
@@ -120,7 +120,7 @@ def _locking_factory(
                 result = func(*args, **kwargs)
                 cache[key] = result
 
-            del keys_to_func_locks[key]
+            keys_to_func_locks.pop(key, None)  # this allows for the use of reentrant locks
             return result
 
         def cache_info() -> _CacheInfo:
@@ -154,7 +154,7 @@ def locking(
     func: None = ...,
     *,
     cache_lock: ty.Optional[proto.ContextManager] = ...,
-    make_func_lock: ty.Optional[ty.Callable[[_HashedTuple], proto.ContextManager]] = ...,
+    make_func_lock: ty.Optional[ty.Callable[[HashedTuple], proto.ContextManager]] = ...,
 ) -> ty.Callable[[ty.Callable[_P, _R]], ty.Callable[_P, _R]]:
     ...  # pragma: no cover
 
@@ -167,7 +167,7 @@ def locking(
     func: ty.Optional[ty.Callable[_P, _R]] = None,
     *,
     cache_lock: ty.Optional[proto.ContextManager] = None,
-    make_func_lock: ty.Optional[ty.Callable[[_HashedTuple], proto.ContextManager]] = None,
+    make_func_lock: ty.Optional[ty.Callable[[HashedTuple], proto.ContextManager]] = None,
 ):
     """A threadsafe, simple, unbounded cache.
 
@@ -189,7 +189,7 @@ def locking(
     usage that is not worth the cost.
     """
 
-    def default_make_func_lock(_key: _HashedTuple) -> threading.Lock:
+    def default_make_func_lock(_key: HashedTuple) -> threading.Lock:
         return threading.Lock()
 
     decorator = _locking_factory(

{thds_core-1.44.20250730010425.dist-info → thds_core-1.44.20250730172116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.core
-Version: 1.44.20250730010425
+Version: 1.44.20250730172116
 Summary: Core utilities.
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_core-1.44.20250730010425.dist-info → thds_core-1.44.20250730172116.dist-info}/RECORD

@@ -1,6 +1,6 @@
 thds/core/__init__.py,sha256=p5ZTz0yURvtiJlUspnI6aMb9nIekTkzU8sqr8HrnyiM,968
 thds/core/ansi_esc.py,sha256=QZ3CptZbX4N_hyP2IgqfTbNt9tBPaqy7ReTMQIzGbrc,870
-thds/core/cache.py,sha256=nL0oAyZrhPqyBBLevnOWSWVoEBrftaG3aE6Qq6tvmAA,7153
+thds/core/cache.py,sha256=VGotQHrwxotgWL91oisQbK0fIxvp_5okA4tDQmnc-y0,7188
 thds/core/calgitver.py,sha256=6ioH5MGE65l_Dp924oD5CWrLyxKgmhtn46YwGxFpHfM,2497
 thds/core/cm.py,sha256=WZB8eQU0DaBYj9s97nc3PuCtai9guovfyiQH68zhLzY,1086
 thds/core/concurrency.py,sha256=NQunF_tJ_z8cfVyhzkTPlb-nZrgu-vIk9_3XffgscKQ,3520
@@ -73,8 +73,8 @@ thds/core/sqlite/structured.py,sha256=SvZ67KcVcVdmpR52JSd52vMTW2ALUXmlHEeD-VrzWV
 thds/core/sqlite/types.py,sha256=oUkfoKRYNGDPZRk29s09rc9ha3SCk2SKr_K6WKebBFs,1308
 thds/core/sqlite/upsert.py,sha256=BmKK6fsGVedt43iY-Lp7dnAu8aJ1e9CYlPVEQR2pMj4,5827
 thds/core/sqlite/write.py,sha256=z0219vDkQDCnsV0WLvsj94keItr7H4j7Y_evbcoBrWU,3458
-thds_core-1.44.20250730010425.dist-info/METADATA,sha256=DFQJY-wqZJBlDl6RKkEWb0g-VG1inNZBleXJd-ultXA,2216
-thds_core-1.44.20250730010425.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_core-1.44.20250730010425.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds_core-1.44.20250730010425.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_core-1.44.20250730010425.dist-info/RECORD,,
+thds_core-1.44.20250730172116.dist-info/METADATA,sha256=Yv8xV6o0RXAO6pA6E831iY7JMQrNoZ_szLCmjZxWYss,2216
+thds_core-1.44.20250730172116.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_core-1.44.20250730172116.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds_core-1.44.20250730172116.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_core-1.44.20250730172116.dist-info/RECORD,,