ask-shell 0.5.0__tar.gz → 0.5.2__tar.gz

{ask_shell-0.5.0 → ask_shell-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ask-shell
-Version: 0.5.0
+Version: 0.5.2
 Summary: CLIs with prompts, shell runs, and testable flows
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT

{ask_shell-0.5.0 → ask_shell-0.5.2}/ask_shell/__init__.py

@@ -6,7 +6,7 @@ from ask_shell import shell_events
 from ask_shell import ask
 from ask_shell.settings import AskShellSettings
 
-VERSION = "0.5.0"
+VERSION = "0.5.2"
 __all__ = [
     "shell",
     "console",

{ask_shell-0.5.0 → ask_shell-0.5.2}/ask_shell/_internal/_run.py

@@ -13,6 +13,7 @@ from __future__ import annotations
 import atexit
 import logging
 import os
+import random
 import signal
 import subprocess
 import sys
@@ -382,11 +383,20 @@ def _eval_should_retry(config: ShellConfig, result: ShellRun) -> bool:
         return False
 
 
+def _backoff_wait(attempt: int, config: ShellConfig) -> float:
+    """wait = min(initial * 2^(attempt-2), max_wait) + uniform(0, jitter)"""
+    base = min(config.retry_initial_wait * 2 ** (attempt - 2), config.retry_max_wait)
+    return base + random.uniform(0, config.retry_jitter)
+
+
 def _run_attempts(shell_run: ShellRun, output_dir: Path) -> BaseException | None:
     config = shell_run.config
     queue = shell_run._queue
     for attempt in range(1, config.attempts + 1):
         if attempt > 1:
+            wait_seconds = _backoff_wait(attempt, config)
+            logger.info(f"Backoff {wait_seconds:.2f}s before attempt {attempt}/{config.attempts}")
+            time.sleep(wait_seconds)
             queue.put_nowait(ShellRunRetryAttempt(attempt=attempt))
             logger.warning(f"Retrying run {shell_run} attempt {attempt} of {config.attempts}")
         attempt_log_prefix = config.run_log_stem(attempt)
@@ -459,6 +469,9 @@ def run(
     is_binary_call: bool | None = None,
     message_callbacks: list[Callable[[ShellRunEventT], bool]] | None = None,
     print_prefix: str | None = None,
+    retry_initial_wait: float | None = None,
+    retry_jitter: float | None = None,
+    retry_max_wait: float | None = None,
     run_log_stem_prefix: str | None = None,
     run_output_dir: Path | None | None = None,
     settings: AskShellSettings | None = None,
@@ -483,6 +496,9 @@ def run(
         is_binary_call=is_binary_call,
         message_callbacks=message_callbacks,
         print_prefix=print_prefix,
+        retry_initial_wait=retry_initial_wait,
+        retry_jitter=retry_jitter,
+        retry_max_wait=retry_max_wait,
         run_log_stem_prefix=run_log_stem_prefix,
         run_output_dir=run_output_dir,
         settings=settings,
@@ -518,6 +534,9 @@ def run_and_wait(
     is_binary_call: bool | None = None,
     message_callbacks: list[Callable[[ShellRunEventT], bool]] | None = None,
     print_prefix: str | None = None,
+    retry_initial_wait: float | None = None,
+    retry_jitter: float | None = None,
+    retry_max_wait: float | None = None,
     run_log_stem_prefix: str | None = None,
     run_output_dir: Path | None | None = None,
     settings: AskShellSettings | None = None,
@@ -542,6 +561,9 @@ def run_and_wait(
         is_binary_call=is_binary_call,
         message_callbacks=message_callbacks,
         print_prefix=print_prefix,
+        retry_initial_wait=retry_initial_wait,
+        retry_jitter=retry_jitter,
+        retry_max_wait=retry_max_wait,
         run_log_stem_prefix=run_log_stem_prefix,
         run_output_dir=run_output_dir,
         settings=settings,

{ask_shell-0.5.0 → ask_shell-0.5.2}/ask_shell/_internal/models.py

@@ -151,6 +151,9 @@ class ShellConfig(Entity):
     # retry args
     attempts: int = 1
     should_retry: Callable[[ShellRun], bool] = always_retry
+    retry_initial_wait: float = Field(default=5, description="Seconds before first retry, only used when attempts > 1")
+    retry_max_wait: float = Field(default=60, description="Cap on wait between retries")
+    retry_jitter: float = Field(default=5, description="Max random jitter added to wait")
 
     # logging/output
     print_prefix: str = Field(default=None, description="Use cwd+binary_name+first_arg if not provided")  # type: ignore

{ask_shell-0.5.0 → ask_shell-0.5.2}/ask_shell/_internal/rich_progress.py

@@ -31,6 +31,15 @@ def transient_progress() -> Progress:
     )
 
 
+def _is_clean_exit(exc: BaseException | None) -> bool:
+    if exc is None:
+        return True
+    if isinstance(exc, SystemExit) and exc.code in (None, 0):
+        return True
+    exit_code = getattr(exc, "exit_code", None)
+    return exit_code == 0
+
+
 def log_task_done(
     task: new_task,
     *,
@@ -206,5 +215,6 @@ class new_task:
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self.complete()  # Ensure we mark it as complete
-        self.manager.remove_task(self, error=exc_val)
+        self.complete()
+        error = exc_val if not _is_clean_exit(exc_val) else None
+        self.manager.remove_task(self, error=error)

{ask_shell-0.5.0 → ask_shell-0.5.2}/ask_shell/test_docs.py

@@ -8,7 +8,7 @@ EXAMPLES_DIR = Path(__file__).parent.parent / "docs" / "examples"
 
 @pytest.mark.parametrize("example", find_examples(EXAMPLES_DIR), ids=str)
 def test_examples(example: CodeExample, eval_example: EvalExample):
-    eval_example.set_config(line_length=120, target_version="py313", ruff_ignore=["T"])  # pyright: ignore[reportArgumentType]
+    eval_example.set_config(line_length=120, target_version="py313", ruff_ignore=["I001", "T"])  # pyright: ignore[reportArgumentType]
     prefix = example.prefix_settings()
     if prefix.get("test", "").startswith("skip"):
         pytest.skip(prefix["test"])

{ask_shell-0.5.0 → ask_shell-0.5.2}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "ask-shell"
-version = "0.5.0"
+version = "0.5.2"
 description = "CLIs with prompts, shell runs, and testable flows"
 requires-python = ">=3.13"
 license = "MIT"