verifiers 0.2.1.dev1__py3-none-any.whl → 0.2.1.dev2__py3-none-any.whl

verifiers/v1/cli/dashboard/base.py

@@ -9,6 +9,8 @@ from collections.abc import Callable, Iterator
 from rich.console import Group
 from rich.live import Live
 
+from verifiers.v1.utils.interrupt import cleaning_up
+
 try:  # POSIX-only terminal control; absent on Windows, where key reading is skipped.
     import termios
     import tty
@@ -82,10 +84,17 @@ async def live_view(
     """Refresh `render()` every 0.25s until the block exits, then draw one final frame. When
     `on_key` is given, left/right arrow presses are dispatched to it (and redraw at once)."""
     with Live(render(), auto_refresh=False) as live:
+        stopping = False
 
         async def loop() -> None:
             while True:
-                await asyncio.sleep(0.25)
+                try:
+                    await asyncio.sleep(0.25)
+                except asyncio.CancelledError:
+                    # Ctrl-C cancels every task at once; keep refreshing so the cleanup notice
+                    # stays live through teardown, stopping only when live_view tears down.
+                    if stopping or not cleaning_up():
+                        raise
                 live.update(render(), refresh=True)
 
         task = asyncio.create_task(loop())
@@ -93,6 +102,7 @@ async def live_view(
             try:
                 yield
             finally:
+                stopping = True
                 task.cancel()
                 with contextlib.suppress(asyncio.CancelledError):
                     await task

verifiers/v1/cli/dashboard/eval.py

@@ -14,6 +14,7 @@ from rich.text import Text
 
 from verifiers.v1.cli.dashboard.base import live_view
 from verifiers.v1.cli.output import output_path
+from verifiers.v1.utils.interrupt import cleaning_up
 from verifiers.v1.configs.eval import EvalConfig
 from verifiers.v1.rollout import Phase, Rollout
 from verifiers.v1.trace import Trace
@@ -110,6 +111,22 @@ def _aligned(rows: list[list[str]]) -> list[str]:
     ]
 
 
+def _interrupt_footer() -> Group | None:
+    """The graceful-shutdown notice under the rollouts once Ctrl-C has begun teardown — the
+    on-screen echo of the warning (console logging is silenced in rich mode); a further Ctrl-C
+    is ignored while it shows. Sits beside the `--push` line, mirroring its placement."""
+    if not cleaning_up():
+        return None
+    return Group(
+        Rule(style="dim"),
+        Text(
+            "interrupted — cleaning up, tearing down containers/sandboxes. "
+            "please wait; a further ctrl-c is ignored.",
+            style="yellow",
+        ),
+    )
+
+
 def _warning(config: EvalConfig) -> Text | None:
     """A local-runtime caution for a code-running harness (none for the tool-less `null`),
     shown above the overview rather than as a row in it."""
@@ -561,11 +578,11 @@ def _render(
     now = time.time()
     warning = _warning(config)
     header = Group(warning, Text(""), Overview(config)) if warning else Overview(config)
-    # The --push status line appears under the rollouts once the upload starts (None during the run
-    # / when off). Measure the fixed top (header + progress + rule) and the footer so the rollout
-    # rows fill what's left; page through them (timer / arrows) when they'd overflow (else rich
-    # truncates).
-    footer = _push_footer(push)
+    # The --push status line (and, on Ctrl-C, the cleanup notice) appear under the rollouts. Measure
+    # the fixed top (header + progress + rule) and the footer so the rollout rows fill what's left;
+    # page through them (timer / arrows) when they'd overflow (else rich truncates).
+    footers = [f for f in (_push_footer(push), _interrupt_footer()) if f is not None]
+    footer = Group(*footers) if footers else None
     top = Group(header, Progress(rollouts, start), Rule(style="dim"))
     reserved = len(_CONSOLE.render_lines(top))
     if footer is not None:

verifiers/v1/cli/eval/main.py

@@ -2,12 +2,12 @@
 
 import asyncio
 import logging
-import signal
 import sys
 
 from pydantic_config import cli
 
 import verifiers.v1 as vf
+from verifiers.v1.utils.interrupt import install as install_interrupt
 from verifiers.v1.utils.logging import setup_logging
 from verifiers.v1.cli.output import output_path, write_config
 from verifiers.v1.cli.resolve import (
@@ -80,21 +80,30 @@ def main(argv: list[str] | None = None) -> None:
         logging.lastResort = None
     else:
         setup_logging(level, log_file=log_file, console=True)
-    # Make SIGTERM behave like Ctrl-C (SIGINT) so a killed/timed-out eval still runs each
-    # rollout's `finally` (tears down containers/sandboxes) and any worker pool it spawned.
-    signal.signal(signal.SIGTERM, lambda *_: (_ for _ in ()).throw(KeyboardInterrupt()))
+    # First Ctrl-C / SIGTERM warns and raises KeyboardInterrupt so a killed/timed-out eval still
+    # runs each rollout's `finally` (tears down containers/sandboxes) and any worker pool it
+    # spawned; further signals during that cleanup are swallowed so an impatient second Ctrl-C
+    # can't orphan those resources.
+    install_interrupt()
 
-    if config.is_legacy:  # v0 backwards-compat: run the classic env, bridged to Traces
-        from verifiers.v1.legacy import run_legacy_eval
+    try:
+        if (
+            config.is_legacy
+        ):  # v0 backwards-compat: run the classic env, bridged to Traces
+            from verifiers.v1.legacy import run_legacy_eval
 
-        traces = asyncio.run(run_legacy_eval(config))
-    elif config.server:  # opt-in: drive rollouts through the env-server worker pool
-        from verifiers.v1.cli.eval.runner import run_eval_server
+            traces = asyncio.run(run_legacy_eval(config))
+        elif config.server:  # opt-in: drive rollouts through the env-server worker pool
+            from verifiers.v1.cli.eval.runner import run_eval_server
 
-        traces = asyncio.run(run_eval_server(config))
-    else:  # in-process (default), with or without the live dashboard
-        env = vf.Environment(config)
-        traces = asyncio.run(run_eval(env, config))
+            traces = asyncio.run(run_eval_server(config))
+        else:  # in-process (default), with or without the live dashboard
+            env = vf.Environment(config)
+            traces = asyncio.run(run_eval(env, config))
+    except KeyboardInterrupt:
+        # Graceful cleanup has already run (each rollout's `finally`); partial results are on
+        # disk. Exit on the conventional Ctrl-C code without a traceback.
+        raise SystemExit(130)
     if config.push and not rich:
         from verifiers.v1.push import push_traces
 

verifiers/v1/utils/interrupt.py

@@ -0,0 +1,33 @@
+"""Graceful-shutdown signal handling for the eval CLI: the first Ctrl-C/SIGTERM warns and
+raises KeyboardInterrupt so asyncio unwinds each rollout's teardown `finally`; further signals
+are swallowed so a second Ctrl-C can't orphan containers/sandboxes mid-cleanup."""
+
+import logging
+import signal
+
+logger = logging.getLogger(__name__)
+
+_cleaning_up = False
+
+
+def cleaning_up() -> bool:
+    """Whether a shutdown signal has begun graceful cleanup (read by the dashboard)."""
+    return _cleaning_up
+
+
+def install() -> None:
+    """Route SIGINT/SIGTERM through the graceful-shutdown handler."""
+
+    def handle(*_) -> None:
+        global _cleaning_up
+        first, _cleaning_up = not _cleaning_up, True
+        logger.warning(
+            "interrupted — cleaning up, please wait..."
+            if first
+            else "cleanup in progress — please wait (ctrl-c ignored)"
+        )
+        if first:
+            raise KeyboardInterrupt
+
+    signal.signal(signal.SIGINT, handle)
+    signal.signal(signal.SIGTERM, handle)

{verifiers-0.2.1.dev1.dist-info → verifiers-0.2.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: verifiers
-Version: 0.2.1.dev1
+Version: 0.2.1.dev2
 Summary: Verifiers: Environments for LLM Reinforcement Learning
 Project-URL: Homepage, https://github.com/primeintellect-ai/verifiers
 Project-URL: Documentation, https://github.com/primeintellect-ai/verifiers

{verifiers-0.2.1.dev1.dist-info → verifiers-0.2.1.dev2.dist-info}/RECORD

@@ -225,12 +225,12 @@ verifiers/v1/cli/resolve.py,sha256=7xPR4enanS574I0GIcv30Hg0xX8OmC9GzVq93Mb9LS8,3
 verifiers/v1/cli/serve.py,sha256=7T_pQdMihmGj7CdsEyVqlro_fBgdJVRkb3ak2qCkZgc,2240
 verifiers/v1/cli/validate.py,sha256=CjjNYXeS8z8Ow0eKcdiKCNVDiMCbOv-tH1mo2mutgpM,9513
 verifiers/v1/cli/dashboard/__init__.py,sha256=nWhXVYuAw-eF4TZbhtSoKWRQytv67WzIEnGISQnRHqY,227
-verifiers/v1/cli/dashboard/base.py,sha256=IMgpzJMsEzg2HUn4BTopzWf2yeYaBULaQlWGwllkz-s,3093
-verifiers/v1/cli/dashboard/eval.py,sha256=-wsqRhX0svFzfYRgVDkxUvsZ8oAY30NZ1jI9hx0nykk,25427
+verifiers/v1/cli/dashboard/base.py,sha256=kUP93zJSIVLptSbnWX6MOy8kGg63fpeAzPqakCpPyDc,3547
+verifiers/v1/cli/dashboard/eval.py,sha256=hYRC_2HVlia87yR1MOGjMwzet1rVpeQzxZaKmo3wjRg,26166
 verifiers/v1/cli/dashboard/replay.py,sha256=4SmCFx7UbDbdRKszrPkOKSZQ303ezc9SqJLbAbClL6s,3119
 verifiers/v1/cli/dashboard/validate.py,sha256=1EyP2wkm0KMwl1Xf32my-ulmHwHHWzlHNgtbf-3ZQXs,3355
 verifiers/v1/cli/eval/__init__.py,sha256=64KcYxE9GDt_TB1CNuRI5uOx3A5npitYRKFuCHbV4DM,22
-verifiers/v1/cli/eval/main.py,sha256=7l5YOS12tW6zmo0MnxLMlBr1xcGJbUyV3oS8ly1iddY,4504
+verifiers/v1/cli/eval/main.py,sha256=48dGLSq8CZ48pjCiMRd8p1gRFcYXVwVinDVdYdThzfU,4931
 verifiers/v1/cli/eval/resume.py,sha256=CWKtKYmU6vtHD_rd4dfV4YV7ccgRNs7jBtA0zeOfHzA,5077
 verifiers/v1/cli/eval/runner.py,sha256=iSnocgsuZALpVCX0TewlHhisGFgnRoaIxePET70c7nM,10769
 verifiers/v1/clients/__init__.py,sha256=EgDgl5RYcjQ5W5ROjleL91eJoVfI36SsV9pSLrWVMVI,595
@@ -307,10 +307,11 @@ verifiers/v1/utils/aio.py,sha256=ZKTHeURNbWhTpHMyYuqMLsdPWVHyn5anfG1IJs5y-Zg,148
 verifiers/v1/utils/format.py,sha256=NfQo9M5KMzWCZpQaet5YtsJx56vCKAZPfbjZZJLJhhM,2187
 verifiers/v1/utils/generic.py,sha256=cpiyt_GIhFcHVK3dh7eBDqQJ6tQFXSQyHUuPKRLZfj4,647
 verifiers/v1/utils/install.py,sha256=fWNsyKrw_PyhC0Qhqv5Ri0adFm5Ddx4AVy_hbsra1GU,1390
+verifiers/v1/utils/interrupt.py,sha256=OTb6zQ9lpS3xQV5j4VDNiSB1N20fllaDbY8glI8Akx4,1027
 verifiers/v1/utils/logging.py,sha256=OcMHA6NsYux3oIzjPuI95rDWmFBHNcHDjZeNIhXTX-Y,2084
 verifiers/v1/utils/memory.py,sha256=ZkIvGk6uITAH5sKon65LifKPbvZr8mJ__PVc23FZpOQ,1835
-verifiers-0.2.1.dev1.dist-info/METADATA,sha256=KLAE-jA_yHTgBkgxjcPlDRXoGC_SHLV88ra_G9KpKg4,5135
-verifiers-0.2.1.dev1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-verifiers-0.2.1.dev1.dist-info/entry_points.txt,sha256=vYJT3h4I0-pEnXGaizK-6J56h-qrh-HvMtBTiATK06w,517
-verifiers-0.2.1.dev1.dist-info/licenses/LICENSE,sha256=v0RrUsdV3IDoZhrRce297IXS3xMHNJ-_LdLpFAUWb9k,1072
-verifiers-0.2.1.dev1.dist-info/RECORD,,
+verifiers-0.2.1.dev2.dist-info/METADATA,sha256=EG-uGv9lIPLOh3mU4JY9GFSV2-_-HR7rrxkGE4JYKMs,5135
+verifiers-0.2.1.dev2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+verifiers-0.2.1.dev2.dist-info/entry_points.txt,sha256=vYJT3h4I0-pEnXGaizK-6J56h-qrh-HvMtBTiATK06w,517
+verifiers-0.2.1.dev2.dist-info/licenses/LICENSE,sha256=v0RrUsdV3IDoZhrRce297IXS3xMHNJ-_LdLpFAUWb9k,1072
+verifiers-0.2.1.dev2.dist-info/RECORD,,