cooptools 1.64__tar.gz → 1.65__tar.gz

{cooptools-1.64 → cooptools-1.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cooptools
-Version: 1.64
+Version: 1.65
 Summary: Generic Tooling
 Home-page: https://github.com/tylertjburns/cooptools
 Author: tburns

{cooptools-1.64 → cooptools-1.65}/cooptools/decor.py

@@ -2,7 +2,8 @@ import functools
 import time
 import logging
 import inspect
-from typing import Protocol, Dict
+import threading
+from typing import Protocol, Dict, Optional
 from typing_extensions import runtime_checkable
 
 @runtime_checkable
@@ -15,6 +16,22 @@ class TimeableProtocol(Protocol):
 
 TIMEABLE_LOOKUPATTR = "_timeable"
 
+# ---------------------------------------------------------------------------
+# Thread-local call stack — tracks the currently executing @timer chain so
+# each invocation knows its parent function.  Push before calling func, pop
+# after (even on exception) so the stack stays consistent.
+# ---------------------------------------------------------------------------
+
+_call_stack_local = threading.local()
+
+
+def get_call_stack() -> list:
+    """Return the current thread's timer call stack (mutable live reference)."""
+    if not hasattr(_call_stack_local, 'stack'):
+        _call_stack_local.stack = []
+    return _call_stack_local.stack
+
+
 def try_handler(logger: logging.Logger = None):
     def wrapper(func):
         @functools.wraps(func)
@@ -32,7 +49,8 @@ def try_handler(logger: logging.Logger = None):
     return wrapper
 
 
-def update_ttc_values(ttc: TimeableProtocol, func_name: str, run_time: float):
+def update_ttc_values(ttc: TimeableProtocol, func_name: str, run_time: float,
+                      parent: Optional[str] = None):
     #update counter
     ttc.ns.setdefault(func_name, 0)
     ttc.ns[func_name] += 1
@@ -55,6 +73,10 @@ def update_ttc_values(ttc: TimeableProtocol, func_name: str, run_time: float):
     my_avg = ttc.internally_tracked_times[func_name] / ttc.ns[func_name]
     ttc.avgs[func_name] = my_avg
 
+    # Record call-chain parent once (hierarchy is static; first writer wins).
+    if parent is not None and hasattr(ttc, 'parents'):
+        ttc.parents.setdefault(func_name, parent)
+
 
 def timer(logger: logging.Logger = None,
           log_level: int = logging.DEBUG,
@@ -68,11 +90,20 @@ def timer(logger: logging.Logger = None,
 
         @functools.wraps(func)
         def wrapper_timer(*args, **kwargs):
-            # capture time
+            # Push to call stack before executing so nested @timer calls see us
+            # as their parent.  Pop in finally so the stack stays consistent
+            # even if func raises.
+            _stack = get_call_stack()
+            _parent: Optional[str] = _stack[-1] if _stack else None
+            _stack.append(func.__name__)
+
             start_time = time.perf_counter()  # 1
-            value = func(*args, **kwargs)
-            end_time = time.perf_counter()  # 2
-            run_time = end_time - start_time  # 3
+            try:
+                value = func(*args, **kwargs)
+            finally:
+                end_time = time.perf_counter()  # 2
+                run_time = end_time - start_time  # 3
+                _stack.pop()
 
             ttc = None
 
@@ -96,7 +127,8 @@ def timer(logger: logging.Logger = None,
             if ttc is None:
                 return value
 
-            update_ttc_values(ttc, func_name=func.__name__, run_time=run_time)
+            update_ttc_values(ttc, func_name=func.__name__, run_time=run_time,
+                              parent=_parent)
             end_time2 = time.perf_counter()
             timer_runtime = end_time2 - end_time
             update_ttc_values(ttc, func_name=TIMEABLE_LOOKUPATTR, run_time=timer_runtime)

{cooptools-1.64 → cooptools-1.65}/cooptools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cooptools
-Version: 1.64
+Version: 1.65
 Summary: Generic Tooling
 Home-page: https://github.com/tylertjburns/cooptools
 Author: tburns

{cooptools-1.64 → cooptools-1.65}/setup.py

@@ -7,7 +7,7 @@ with open('requirements.txt') as f:
     requirements = f.read().splitlines()
 
 setuptools.setup(name='cooptools',
-      version='1.64',
+      version='1.65',
       description='Generic Tooling',
       url='https://github.com/tylertjburns/cooptools',
       author='tburns',