aiuse 3.3.1__tar.gz → 3.3.2__tar.gz

{aiuse-3.3.1/src/aiuse.egg-info → aiuse-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiuse
-Version: 3.3.1
+Version: 3.3.2
 Summary: Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments
 Author: djbclark
 License-Expression: MIT

{aiuse-3.3.1 → aiuse-3.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aiuse"
-version = "3.3.1"
+version = "3.3.2"
 description = "Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments"
 readme = "README.md"
 requires-python = ">=3.11"

{aiuse-3.3.1 → aiuse-3.3.2}/src/aiuse/__init__.py

@@ -1,3 +1,3 @@
 """Aggregate provider quotas and flag use-it-or-lose-it allotments."""
 
-__version__ = "3.3.1"
+__version__ = "3.3.2"

{aiuse-3.3.1 → aiuse-3.3.2}/src/aiuse/tty.py

@@ -15,6 +15,7 @@ three are normally the same device), so ``aiuse </dev/null`` is protected too.
 
 from __future__ import annotations
 
+import os
 import sys
 from typing import Any
 
@@ -48,8 +49,27 @@ def save_stdin_tty() -> Any | None:
         return None
 
 
+def _owns_terminal(fd: int) -> bool:
+    """True when this process may write terminal attributes without SIGTTOU.
+
+    ``tcsetattr`` from a process that is not in the terminal's foreground
+    process group raises SIGTTOU, which *stops* the process (``aiuse &``,
+    ``brew test``, any job-control runner): a hang, not an error. Such a
+    process has no business resetting someone else's terminal anyway; the
+    foreground shell restores it at its next prompt.
+    """
+    try:
+        return os.tcgetpgrp(fd) == os.getpgrp()
+    except (OSError, AttributeError):
+        return False
+
+
 def restore_stdin_tty(saved: Any | None) -> None:
-    """Restore termios attrs previously returned by ``save_stdin_tty``."""
+    """Restore termios attrs previously returned by ``save_stdin_tty``.
+
+    A no-op when the attributes are unchanged (the common case) and when this
+    process is not the terminal's foreground job (see ``_owns_terminal``).
+    """
     if saved is None:
         return
     try:
@@ -58,6 +78,11 @@ def restore_stdin_tty(saved: Any | None) -> None:
         return
     try:
         fd, attrs = saved
-        termios.tcsetattr(int(fd), termios.TCSADRAIN, attrs)
+        fd = int(fd)
+        if termios.tcgetattr(fd) == attrs:
+            return
+        if not _owns_terminal(fd):
+            return
+        termios.tcsetattr(fd, termios.TCSADRAIN, attrs)
     except (termios.error, OSError, ValueError, TypeError):
         return

{aiuse-3.3.1 → aiuse-3.3.2/src/aiuse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiuse
-Version: 3.3.1
+Version: 3.3.2
 Summary: Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments
 Author: djbclark
 License-Expression: MIT

{aiuse-3.3.1 → aiuse-3.3.2}/tests/test_tty.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import pytest
+
 from aiuse import tty
 from aiuse.collectors import runner
 from aiuse.tty import restore_stdin_tty, save_stdin_tty
@@ -50,11 +52,45 @@ def test_restore_targets_the_saved_fd(monkeypatch):
     import termios
 
     calls: list[tuple[int, int, object]] = []
+    monkeypatch.setattr(termios, "tcgetattr", lambda fd: ["raw"])
     monkeypatch.setattr(termios, "tcsetattr", lambda fd, when, attrs: calls.append((fd, when, attrs)))
+    monkeypatch.setattr(tty, "_owns_terminal", lambda fd: True)
     restore_stdin_tty((2, ["attrs"]))
     assert calls == [(2, termios.TCSADRAIN, ["attrs"])]
 
 
+def test_restore_is_a_noop_when_nothing_changed(monkeypatch):
+    """No tcsetattr at all in the common case (no SIGTTOU risk, no drain)."""
+    import termios
+
+    monkeypatch.setattr(termios, "tcgetattr", lambda fd: ["attrs"])
+    monkeypatch.setattr(termios, "tcsetattr", lambda *_a: pytest.fail("tcsetattr on unchanged attrs"))
+    monkeypatch.setattr(tty, "_owns_terminal", lambda fd: pytest.fail("checked pgrp on unchanged attrs"))
+    restore_stdin_tty((2, ["attrs"]))
+
+
+def test_restore_never_writes_from_a_background_job(monkeypatch):
+    """``aiuse --version &`` with stderr on the tty: tcsetattr would SIGTTOU-stop us.
+
+    Regression: 3.3.1's ``brew test`` hung for five minutes in state T.
+    """
+    import termios
+
+    monkeypatch.setattr(termios, "tcgetattr", lambda fd: ["raw"])
+    monkeypatch.setattr(termios, "tcsetattr", lambda *_a: pytest.fail("tcsetattr from a background process group"))
+    monkeypatch.setattr(tty.os, "tcgetpgrp", lambda fd: 4242)
+    monkeypatch.setattr(tty.os, "getpgrp", lambda: 1)
+    restore_stdin_tty((2, ["attrs"]))
+
+
+def test_owns_terminal_matches_foreground_pgrp(monkeypatch):
+    monkeypatch.setattr(tty.os, "tcgetpgrp", lambda fd: 7)
+    monkeypatch.setattr(tty.os, "getpgrp", lambda: 7)
+    assert tty._owns_terminal(2)
+    monkeypatch.setattr(tty.os, "tcgetpgrp", lambda fd: (_ for _ in ()).throw(OSError("not a tty")))
+    assert not tty._owns_terminal(2)
+
+
 def test_run_collectors_restores_the_terminal_before_returning(monkeypatch):
     """A child that leaves the terminal raw must not corrupt the report printed next."""
     events: list[str] = []