shrinkray 25.12.27.0__py3-none-any.whl → 25.12.27.1__py3-none-any.whl

shrinkray/__main__.py

@@ -75,12 +75,14 @@ async def run_shrink_ray(
 )
 @click.option(
     "--timeout",
-    default=1,
+    default=None,
     type=click.FLOAT,
     help=(
-        "Time out subprocesses after this many seconds. If set to <= 0 then "
-        "no timeout will be used. Any commands that time out will be treated "
-        "as failing the test"
+        "Time out subprocesses after this many seconds. If not specified, "
+        "runs the interestingness test once and sets timeout to 10x the "
+        "measured time (capped at 5 minutes). If set to <= 0 then no timeout "
+        "will be used. Any commands that time out will be treated as failing "
+        "the test"
     ),
 )
 @click.option(
@@ -212,7 +214,7 @@ def main(
     backup: str,
     filename: str,
     test: list[str],
-    timeout: float,
+    timeout: float | None,
     in_place: bool,
     parallelism: int,
     seed: int,
@@ -225,7 +227,7 @@ def main(
     ui_type: UIType,
     theme: str,
 ) -> None:
-    if timeout <= 0:
+    if timeout is not None and timeout <= 0:
         timeout = float("inf")
 
     if not os.access(test[0], os.X_OK):

shrinkray/state.py

@@ -36,13 +36,32 @@ class TimeoutExceededOnInitial(InvalidInitialExample):
         )
 
 
+# Constants for dynamic timeout
+DYNAMIC_TIMEOUT_CALIBRATION_TIMEOUT = 300.0  # 5 minutes for first call
+DYNAMIC_TIMEOUT_MULTIPLIER = 10
+DYNAMIC_TIMEOUT_MAX = 300.0  # 5 minutes maximum
+DYNAMIC_TIMEOUT_MIN = 1.0  # 1 second minimum to prevent edge cases
+
+
+def compute_dynamic_timeout(runtime: float) -> float:
+    """Compute dynamic timeout based on measured runtime.
+
+    The timeout is set to 10x the measured runtime, clamped between
+    DYNAMIC_TIMEOUT_MIN and DYNAMIC_TIMEOUT_MAX.
+    """
+    return max(
+        DYNAMIC_TIMEOUT_MIN,
+        min(runtime * DYNAMIC_TIMEOUT_MULTIPLIER, DYNAMIC_TIMEOUT_MAX),
+    )
+
+
 @define(slots=False)
 class ShrinkRayState[TestCase](ABC):
     input_type: Any  # InputType from __main__
     in_place: bool
     test: list[str]
     filename: str
-    timeout: float
+    timeout: float | None
     base: str
     parallelism: int
     initial: TestCase
@@ -127,7 +146,8 @@ class ShrinkRayState[TestCase](ABC):
             completed = await trio.run_process(command, **kwargs)
             runtime = time.time() - start_time
 
-            if runtime >= self.timeout and self.first_call:
+            # Check for timeout violation (only when timeout is explicitly set)
+            if self.timeout is not None and runtime >= self.timeout and self.first_call:
                 self.initial_exit_code = completed.returncode
                 self.first_call = False
                 raise TimeoutExceededOnInitial(
@@ -137,6 +157,9 @@ class ShrinkRayState[TestCase](ABC):
 
             if self.first_call:
                 self.initial_exit_code = completed.returncode
+                # Set dynamic timeout if not explicitly specified
+                if self.timeout is None:
+                    self.timeout = compute_dynamic_timeout(runtime)
             self.first_call = False
 
             # Store captured output
@@ -168,9 +191,19 @@ class ShrinkRayState[TestCase](ABC):
             sp = await nursery.start(call_with_kwargs)
 
             try:
-                with trio.move_on_after(
-                    self.timeout * 10 if self.first_call else self.timeout
-                ):
+                # Determine effective timeout for this call
+                if self.first_call:
+                    # For first call: use calibration timeout if dynamic, otherwise 10x explicit timeout
+                    if self.timeout is None:
+                        effective_timeout = DYNAMIC_TIMEOUT_CALIBRATION_TIMEOUT
+                    else:
+                        effective_timeout = self.timeout * 10
+                else:
+                    # For subsequent calls, timeout must be set (either explicit or computed)
+                    assert self.timeout is not None
+                    effective_timeout = self.timeout
+
+                with trio.move_on_after(effective_timeout):
                     await sp.wait()
 
                 runtime = time.time() - start_time
@@ -179,7 +212,12 @@ class ShrinkRayState[TestCase](ABC):
                     # Process didn't terminate before timeout - kill it
                     await self._interrupt_wait_and_kill(sp)
 
-                if runtime >= self.timeout and self.first_call:
+                # Check for timeout violation (only when timeout is explicitly set)
+                if (
+                    self.timeout is not None
+                    and runtime >= self.timeout
+                    and self.first_call
+                ):
                     raise TimeoutExceededOnInitial(
                         timeout=self.timeout,
                         runtime=runtime,
@@ -187,6 +225,10 @@ class ShrinkRayState[TestCase](ABC):
             finally:
                 if self.first_call:
                     self.initial_exit_code = sp.returncode
+                    # Set dynamic timeout if not explicitly specified
+                    if self.timeout is None:
+                        runtime = time.time() - start_time
+                        self.timeout = compute_dynamic_timeout(runtime)
                 self.first_call = False
 
             result: int | None = sp.returncode

shrinkray/subprocess/client.py

@@ -127,7 +127,7 @@ class SubprocessClient:
         file_path: str,
         test: list[str],
         parallelism: int | None = None,
-        timeout: float = 1.0,
+        timeout: float | None = None,
         seed: int = 0,
         input_type: str = "all",
         in_place: bool = False,
@@ -138,10 +138,9 @@ class SubprocessClient:
         trivial_is_error: bool = True,
     ) -> Response:
         """Start the reduction process."""
-        params = {
+        params: dict[str, Any] = {
             "file_path": file_path,
             "test": test,
-            "timeout": timeout,
             "seed": seed,
             "input_type": input_type,
             "in_place": in_place,
@@ -153,6 +152,8 @@ class SubprocessClient:
         }
         if parallelism is not None:
             params["parallelism"] = parallelism
+        if timeout is not None:
+            params["timeout"] = timeout
         return await self.send_command("start", params)
 
     async def get_status(self) -> Response:

shrinkray/subprocess/worker.py

@@ -169,7 +169,7 @@ class ReducerWorker:
         filename = params["file_path"]
         test = params["test"]
         parallelism = params.get("parallelism", os.cpu_count() or 1)
-        timeout = params.get("timeout", 1.0)
+        timeout = params.get("timeout")  # None means dynamic timeout
         seed = params.get("seed", 0)
         input_type = InputType[params.get("input_type", "all")]
         in_place = params.get("in_place", False)

shrinkray/tui.py

@@ -98,7 +98,7 @@ class ReductionClientProtocol(Protocol):
         file_path: str,
         test: list[str],
         parallelism: int | None = None,
-        timeout: float = 1.0,
+        timeout: float | None = None,
         seed: int = 0,
         input_type: str = "all",
         in_place: bool = False,
@@ -616,7 +616,7 @@ class ShrinkRayApp(App[None]):
         file_path: str,
         test: list[str],
         parallelism: int | None = None,
-        timeout: float = 1.0,
+        timeout: float | None = None,
         seed: int = 0,
         input_type: str = "all",
         in_place: bool = False,
@@ -657,6 +657,7 @@ class ShrinkRayApp(App[None]):
             yield Label(
                 "Shrink Ray - [h] help, [p] passes, [c] skip pass, [q] quit",
                 id="status-label",
+                markup=False,
             )
             with Vertical(id="stats-container"):
                 yield StatsDisplay(id="stats-display")
@@ -807,7 +808,7 @@ async def _validate_initial_example(
     file_path: str,
     test: list[str],
     parallelism: int | None,
-    timeout: float,
+    timeout: float | None,
     seed: int,
     input_type: str,
     in_place: bool,
@@ -855,7 +856,7 @@ def run_textual_ui(
     file_path: str,
     test: list[str],
     parallelism: int | None = None,
-    timeout: float = 1.0,
+    timeout: float | None = None,
     seed: int = 0,
     input_type: str = "all",
     in_place: bool = False,

{shrinkray-25.12.27.0.dist-info → shrinkray-25.12.27.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shrinkray
-Version: 25.12.27.0
+Version: 25.12.27.1
 Summary: Shrink Ray
 Author-email: "David R. MacIver" <david@drmaciver.com>
 License: MIT
@@ -28,7 +28,8 @@ Requires-Dist: hypothesmith>=0.3.1; extra == "dev"
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-trio>=0.8.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
-Requires-Dist: pytest-textual-snapshot>=1.0.0; extra == "dev"
+Requires-Dist: syrupy>=5.0.0; extra == "dev"
+Requires-Dist: jinja2>=3.0.0; extra == "dev"
 Requires-Dist: coverage[toml]>=7.4.0; extra == "dev"
 Requires-Dist: pygments>=2.17.0; extra == "dev"
 Requires-Dist: basedpyright>=1.1.0; extra == "dev"

{shrinkray-25.12.27.0.dist-info → shrinkray-25.12.27.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shrinkray/__init__.py,sha256=b5MvcvhsEGYya3GRXNbCJAlAL5IZHSsETLK_vtfmXRY,18
-shrinkray/__main__.py,sha256=AL1WNfohkA5Uu7uiCQRhNjzfUc4qKC-UjMTDraPlT8I,10919
+shrinkray/__main__.py,sha256=K3_s96Tyoi7SxNOyoZXkfiEoSxVBL__TJ3o2Cefadmg,11093
 shrinkray/cli.py,sha256=1-qjaIchyCDd-YCdGWtK7q9j9qr6uX6AqtwW8m5QCQg,1697
 shrinkray/display.py,sha256=WYN05uqmUVpZhwi2pxr1U-wLHWZ9KiL0RUlTCBJ1N3E,2430
 shrinkray/formatting.py,sha256=tXCGnhJn-WJGpHMaLHRCAXK8aKJBbrOdiW9QGERrQEk,3121
@@ -7,8 +7,8 @@ shrinkray/problem.py,sha256=Kp7QN10E4tzjdpoqJve8_RT26VpywzQwY0gX2VkBGCo,17277
 shrinkray/process.py,sha256=-eP8h5X0ESbkcTic8FFEzkd4-vwaZ0YI5tLxUR25L8U,1599
 shrinkray/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shrinkray/reducer.py,sha256=xhLo_GF7qrIVoiLHed6Wt4nxjdE-9jj_7K9F76un89o,19877
-shrinkray/state.py,sha256=jqAKlirXjKK6smA2G1BnGjjoH7NgVokQhER2Ax18q64,22381
-shrinkray/tui.py,sha256=YiiCDVxGl5g5TlcZN62NMYiD_IqRV68qoRDkNcasvc4,31540
+shrinkray/state.py,sha256=HQ7VivCXWiP2L53gB0lh6dHcdru6waWZkbPg6rYO7z4,24290
+shrinkray/tui.py,sha256=3RskLo6JvKdUQIHi40R5ka-F_1GkBXyA_d_SkYbLlCw,31601
 shrinkray/ui.py,sha256=xuDUwU-MM3AetvwUB7bfzav0P_drUsBrKFPhON_Nr-k,2251
 shrinkray/work.py,sha256=GEZ14Kk3bvwUxAnACvY-wom2lVWaGrELMNxrDjv03dk,8110
 shrinkray/passes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,12 +22,12 @@ shrinkray/passes/python.py,sha256=3WN1lZTf5oVL8FCTGomhrCuE04wIX9ocKcmFV86NMZA,68
 shrinkray/passes/sat.py,sha256=5Zv4IgGfg3SYplMAAaPLkbBNh4fuVpci4F9GdVacayA,19504
 shrinkray/passes/sequences.py,sha256=jCK1fWBxCz79u7JWSps9wf7Yru7W_FAsJwdgg--CLxU,3040
 shrinkray/subprocess/__init__.py,sha256=FyV2y05uwQ1RTZGwREI0aAVaLX1jiwRcWsdsksFmdbM,451
-shrinkray/subprocess/client.py,sha256=i2CJ7xU8_jklqDl-yphpIv-mwD0gG93jVzEDEtsdWvE,9277
+shrinkray/subprocess/client.py,sha256=erqnPglPO0YNdwEKlmhB3yDo6Mfc00Lxh4T85lZhsDo,9341
 shrinkray/subprocess/protocol.py,sha256=LuHl0IkKpDzYhAGZz_EiTHNqDNq_v1ozg5aUSl7UzE4,6203
-shrinkray/subprocess/worker.py,sha256=IyO9FNQ11vWwrc2ikH-Ca3iGoc03MJOIRNUqK3R06aE,19269
-shrinkray-25.12.27.0.dist-info/licenses/LICENSE,sha256=iMKX79AuokJfIZUnGUARdUp30vVAoIPOJ7ek8TY63kk,1072
-shrinkray-25.12.27.0.dist-info/METADATA,sha256=jdpwOHRfJE7bJnBFBbYlpEw7bINLJaU_v2Pz_aBGsmw,9693
-shrinkray-25.12.27.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shrinkray-25.12.27.0.dist-info/entry_points.txt,sha256=wIZvnGyOdVeaLTiv2klnSyTe-EKkkwn4SwHh9bmJ7qk,104
-shrinkray-25.12.27.0.dist-info/top_level.txt,sha256=fLif8-rFoFOnf5h8-vs3ECkKNWQopTQh3xvl1s7pchQ,10
-shrinkray-25.12.27.0.dist-info/RECORD,,
+shrinkray/subprocess/worker.py,sha256=ke-9DYFH117EpJEntkucTrn7ep7pygzmV-VXkRe1o-E,19294
+shrinkray-25.12.27.1.dist-info/licenses/LICENSE,sha256=iMKX79AuokJfIZUnGUARdUp30vVAoIPOJ7ek8TY63kk,1072
+shrinkray-25.12.27.1.dist-info/METADATA,sha256=bB-_7Y4Gk9a-QiXEFKy_iTDy3nWM72YOYXhq0W_PJ7o,9721
+shrinkray-25.12.27.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shrinkray-25.12.27.1.dist-info/entry_points.txt,sha256=wIZvnGyOdVeaLTiv2klnSyTe-EKkkwn4SwHh9bmJ7qk,104
+shrinkray-25.12.27.1.dist-info/top_level.txt,sha256=fLif8-rFoFOnf5h8-vs3ECkKNWQopTQh3xvl1s7pchQ,10
+shrinkray-25.12.27.1.dist-info/RECORD,,