thds.mops 3.9.20250818180912__py3-none-any.whl → 3.9.20250821162253__py3-none-any.whl

thds/mops/pure/core/lock/types.py

@@ -18,6 +18,7 @@ class LockContents(ty.TypedDict):
     # just for debugging
     hostname: str
     pid: str
+    tid: int
     write_count: int
     first_written_at: str
     first_acquired_at: str

thds/mops/pure/core/lock/write.py

@@ -1,9 +1,11 @@
 import os
+import sys
+import threading
 import typing as ty
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 
-from thds.core import hostname, log
+from thds.core import hostname, log, thread_debug
 
 from . import _funcs
 from .types import LockContents
@@ -37,12 +39,32 @@ class LockEmitter:
             "write_count": self.write_count,
             "hostname": hostname.friendly(),
             "pid": str(os.getpid()),
+            "tid": threading.get_ident(),
             "first_written_at": self.first_written_at,
             "first_acquired_at": first_acquired_at.isoformat() if first_acquired_at else "",
             "released_at": "",
         }
 
 
+def _pid_tid() -> str:
+    return f"{os.getpid()}-{threading.get_ident()}"
+
+
+def _capture_thread_info() -> dict[str, ty.Any]:
+    return dict(
+        ppid=os.getppid(),
+        process_cmd=[" ".join(sys.argv)],
+        **thread_debug.capture_thread_context(),
+    )
+
+
+class _Debug:
+    def __init__(self) -> None:
+        self.original_pid = os.getpid()
+        self.original_thread_id = threading.get_ident()
+        self.thread_info: dict[str, dict] = {_pid_tid(): _capture_thread_info()}
+
+
 class LockfileWriter:
     """The core purpose of this class is to allow setting of first_acquired_at immediately
     after the first time that it is confirmed that we have acquired the lock.
@@ -65,7 +87,7 @@ class LockfileWriter:
         self.blob_store, self.lock_uri = _funcs.store_and_lock_uri(lock_dir_uri)
         self.generate_lock = generate_lock
         self.expire_s = expire_s
-        self.debug = debug
+        self.debug = _Debug() if debug else None
         self.writer_name = writer_name
         self.first_acquired_at: ty.Optional[datetime] = None
 
@@ -115,21 +137,36 @@ class LockfileWriter:
         # 'successful' write, it will not impose extra latency during the
         # latency-critical section.
         if self.debug and self.first_acquired_at:
-            name = (self.writer_name + ";_") if self.writer_name else ""
+            pid = lock_contents["pid"]
+            tid = lock_contents["tid"]
+            pid_tid = f"{pid}-{tid}"
+            if pid_tid not in self.debug.thread_info:
+                self.debug.thread_info[pid_tid] = _capture_thread_info()
+
+            name = (";_name=" + self.writer_name) if self.writer_name else ""
             first_written_at = lock_contents["first_written_at"]
             hostname = lock_contents["hostname"]
-            pid = lock_contents["pid"]
+
             acq_uuid = lock_contents["writer_id"]
             assert "/" not in acq_uuid, lock_contents
             debug_uri = self.blob_store.join(
                 self.lock_dir_uri,
                 "writers-debug",
-                f"firstwrite={first_written_at};_uuid={acq_uuid};_host={hostname};_pid={pid}{name}.json",
+                f"firstwrite={first_written_at};_uuid={acq_uuid};_host={hostname};_pid={pid};_tid={tid}{name}.json",
             )
             try:
                 self.blob_store.putbytes(
                     debug_uri,
-                    _funcs.json_dumpb(lock_contents),
+                    _funcs.json_dumpb(
+                        dict(
+                            lock_contents,
+                            thread_debug=dict(
+                                original_pid=self.debug.original_pid,
+                                original_thread_id=self.debug.original_thread_id,
+                                thread_info=self.debug.thread_info,
+                            ),
+                        )
+                    ),
                     type_hint="application/mops-lock-breadcrumb",
                 )
             except Exception:

{thds_mops-3.9.20250818180912.dist-info → thds_mops-3.9.20250821162253.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.mops
-Version: 3.9.20250818180912
+Version: 3.9.20250821162253
 Summary: ML Ops tools for Trilliant Health
 Author-email: Trilliant Health <info@trillianthealth.com>
 Project-URL: Repository, https://github.com/TrilliantHealth/ds-monorepo

{thds_mops-3.9.20250818180912.dist-info → thds_mops-3.9.20250821162253.dist-info}/RECORD

@@ -72,8 +72,8 @@ thds/mops/pure/core/lock/_funcs.py,sha256=j4g8yVWnrAMPDKqLlq8nTnccM1KHSJ3g71L1iW
 thds/mops/pure/core/lock/cli.py,sha256=uidtmgHB2y5LDkj7SQTncy_cNe1EfIseuiJPV9kcxBU,2488
 thds/mops/pure/core/lock/maintain.py,sha256=UFhXdr9Q6FdPgq3PtELiAKdlRVl1sqF8IzAf3Oun4g4,9718
 thds/mops/pure/core/lock/read.py,sha256=Ct5eYMlkTlEaV5Yhw6HWsDD7VrgdhDZoI6AVIQ0ts-4,1255
-thds/mops/pure/core/lock/types.py,sha256=f32t_e2svMOXUVzcnLkEizw6Q47g3HPQsyAkGT2OKMs,993
-thds/mops/pure/core/lock/write.py,sha256=yuF2zRAzgYOmnet1GXZHwYT7oT1znVB3SPK1_j7orFA,5556
+thds/mops/pure/core/lock/types.py,sha256=EiD3G5FODZnhNDvH_2pcyKuVOdz_gsrYSLiAv8grh1c,1006
+thds/mops/pure/core/lock/write.py,sha256=wJByqa2edVhVcyrCaigWChVW3dYsoPBVt0HXyul-WpQ,6782
 thds/mops/pure/core/memo/__init__.py,sha256=k64vX3XazDkP0m8MZgwqt0BV4vXg-ojK1EDhymucnuo,286
 thds/mops/pure/core/memo/calls.py,sha256=kvm6kn-CbOLxZuo86BvzEJw69p7VlEJ8_mCiWd6uz-g,3631
 thds/mops/pure/core/memo/function_memospace.py,sha256=PlQCs7dZ2Fu3gIjfzJMeOy7R5zPqYQDBp7OuViLqrpc,11644
@@ -109,8 +109,8 @@ thds/mops/pure/tools/summarize/cli.py,sha256=7kDtn24ok8oBO3jFjlMmOK3jnZYpMoE_5Y8
 thds/mops/pure/tools/summarize/run_summary.py,sha256=w45qiQr7elrHDiK9Hgs85gtU3gwLuXa447ih1Y23BBY,5776
 thds/mops/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thds/mops/testing/deferred_imports.py,sha256=f0ezCgQAtzTqW1yAOb0OWgsB9ZrlztLB894LtpWDaVw,3780
-thds_mops-3.9.20250818180912.dist-info/METADATA,sha256=AXXDeIvecUE9yKyihhh319Qga0OLM6mHdgzebjwipvE,2225
-thds_mops-3.9.20250818180912.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_mops-3.9.20250818180912.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
-thds_mops-3.9.20250818180912.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_mops-3.9.20250818180912.dist-info/RECORD,,
+thds_mops-3.9.20250821162253.dist-info/METADATA,sha256=lE6NhLqX55KADAf8V4TBU1gwzby_wSv4JAGptd6-cS8,2225
+thds_mops-3.9.20250821162253.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_mops-3.9.20250821162253.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
+thds_mops-3.9.20250821162253.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_mops-3.9.20250821162253.dist-info/RECORD,,