Merge pull request #49 from pepkit/dev

Release 0.9.2

Author: nsheff

changelog.md

@@ -2,6 +2,11 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format. 
 
+## [0.9.2] -- 2026-04-02
+
+### Fixed
+- Signal handler registration no longer logs false errors in non-main threads (e.g. uvicorn workers); uses `threading.current_thread()` guard instead of try/except
+
 ## [0.9.1] -- 2026-02-27
 
 - Added param to untar function

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ubiquerg"
-version = "0.9.1"
+version = "0.9.2"
 description = "Various utility functions"
 readme = "README.md"
 license = "BSD-2-Clause"

ubiquerg/file_locking.py

@@ -2,6 +2,7 @@
 import glob
 import logging
 import os
+import threading
 from contextlib import contextmanager
 from signal import SIGINT, SIGTERM, getsignal, signal
 
@@ -218,29 +219,24 @@ def read_lock(obj: object) -> object:
         raise AttributeError(f"Cannot lock: {obj}.")
 
     # handle a premature Ctrl+C exit from this context manager
-    old_sigterm = None
-    old_sigint = None
-    try:
-        old_sigterm = getsignal(SIGTERM)
-        old_sigint = getsignal(SIGINT)
+    prev_sigterm = None
+    prev_sigint = None
+    if threading.current_thread() is threading.main_thread():
+        prev_sigterm = getsignal(SIGTERM)
+        prev_sigint = getsignal(SIGINT)
         signal(SIGTERM, locker._interrupt_handler)
         signal(SIGINT, locker._interrupt_handler)
-        # If this is run in a thread, the signal module is not available and raises an exception.
-        # ValueError: signal only works in main thread of the main interpreter
-        # That's fine; in this case, we don't need to handle signals anyway.
-    except ValueError as e:
-        _LOGGER.error(f"Failed to set interrupt handler: {e}")
 
     locker.read_lock()
 
     try:
         yield obj
     finally:
         locker.read_unlock()
-        if old_sigterm is not None:
+        if prev_sigterm is not None:
             try:
-                signal(SIGTERM, old_sigterm)
-                signal(SIGINT, old_sigint)
+                signal(SIGTERM, prev_sigterm)
+                signal(SIGINT, prev_sigint)
             except ValueError:
                 pass
 
@@ -276,30 +272,28 @@ def write_lock(obj: object) -> object:
         raise AttributeError(f"Cannot lock: {obj}.")
 
     # handle a premature Ctrl+C exit from this context manager
-    old_sigterm = None
-    old_sigint = None
-    try:
-        old_sigterm = getsignal(SIGTERM)
-        old_sigint = getsignal(SIGINT)
+    prev_sigterm = None
+    prev_sigint = None
+    if threading.current_thread() is threading.main_thread():
+        prev_sigterm = getsignal(SIGTERM)
+        prev_sigint = getsignal(SIGINT)
         signal(SIGTERM, locker._interrupt_handler)
         signal(SIGINT, locker._interrupt_handler)
-    except ValueError as e:
-        _LOGGER.error(f"Failed to set interrupt handler: {e}")
 
     locker.write_lock()
     try:
         yield obj
     finally:
         locker.write_unlock()
-        if old_sigterm is not None:
+        if prev_sigterm is not None:
             try:
-                signal(SIGTERM, old_sigterm)
-                signal(SIGINT, old_sigint)
+                signal(SIGTERM, prev_sigterm)
+                signal(SIGINT, prev_sigint)
             except ValueError:
                 pass
 
 
-def locked_read_file(filepath, create_file: bool = False) -> str:
+def locked_read_file(filepath: str, create_file: bool = False) -> str:
     """Read a file contents into memory after locking the file.
 
     This will prevent other ThreeLocker-protected processes from writing to the

ubiquerg/files.py

@@ -131,7 +131,7 @@ def untar(src: str, dst: str, **kwargs) -> None:
     Args:
         src: path to unpack
         dst: path to output folder
-        **kwargs: passed to tarfile.extractall (e.g. filter="fully_trusted")
+        **kwargs (Any): passed to tarfile.extractall (e.g. filter="fully_trusted")
     """
     with topen(src) as tf:
         tf.extractall(path=dst, **kwargs)