backon 3.2.0__tar.gz → 3.4.0__tar.gz

{backon-3.2.0 → backon-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: backon
-Version: 3.2.0
+Version: 3.4.0
 Summary: Function decoration for backoff and retry
 Keywords: retry,backoff,decorators
 Author-Email: Llucs <c307lucas@gmail.com>

{backon-3.2.0 → backon-3.4.0}/backon/__init__.py

@@ -25,7 +25,7 @@ from backon._conditions import (
 from backon._decorator import on_exception, on_predicate
 from backon._jitter import full_jitter, random_jitter
 from backon._retry import Retrying, retry, sleep_using_event
-from backon._state import RetryError, RetryState, TryAgain
+from backon._state import RetryCallState, RetryError, RetryState, TryAgain
 from backon._wait_gen import (
     constant,
     decay,
@@ -66,6 +66,7 @@ __all__ = [
     "TryAgain",
     "RetryError",
     "RetryState",
+    "RetryCallState",
     "Stop",
     "RetryCondition",
     "stop_after_attempt",

{backon-3.2.0 → backon-3.4.0}/backon/_common.py

@@ -1,8 +1,6 @@
 import functools
 import logging
-import sys
 import time as time_module
-import traceback
 
 _logger = logging.getLogger("backon")
 _logger.addHandler(logging.NullHandler())
@@ -63,6 +61,8 @@ def _prepare_logger(logger):
 def _config_handlers(
     user_handlers, *, default_handler=None, logger=None, log_level=None
 ):
+    if isinstance(user_handlers, list) and logger is None:
+        return user_handlers
     handlers = []
     if logger is not None:
         assert log_level is not None
@@ -84,28 +84,23 @@ def _config_handlers(
 
 def _log_backoff(details, logger, log_level):
     msg = "Backing off %s(...) for %.1fs (%s)"
-    log_args = [details["target"].__name__, details["wait"]]
-
-    exc_typ, exc, _ = sys.exc_info()
+    exc = details.get("exception")
     if exc is not None:
-        exc_fmt = traceback.format_exception_only(exc_typ, exc)[-1]
-        log_args.append(exc_fmt.rstrip("\n"))
+        exc_fmt = f"{type(exc).__name__}: {exc}"
     else:
-        log_args.append(details["value"])
+        exc_fmt = details.get("value", "unknown")
+    log_args = [details["target"].__name__, details["wait"], exc_fmt]
     logger.log(log_level, msg, *log_args)
 
 
 def _log_giveup(details, logger, log_level):
     msg = "Giving up %s(...) after %d tries (%s)"
-    log_args = [details["target"].__name__, details["tries"]]
-
-    exc_typ, exc, _ = sys.exc_info()
+    exc = details.get("exception")
     if exc is not None:
-        exc_fmt = traceback.format_exception_only(exc_typ, exc)[-1]
-        log_args.append(exc_fmt.rstrip("\n"))
+        exc_fmt = f"{type(exc).__name__}: {exc}"
     else:
-        log_args.append(details["value"])
-
+        exc_fmt = details.get("value", "unknown")
+    log_args = [details["target"].__name__, details["tries"], exc_fmt]
     logger.log(log_level, msg, *log_args)
 
 

{backon-3.2.0 → backon-3.4.0}/backon/_decorator.py

@@ -21,7 +21,7 @@ from backon._conditions import (
     retry_if_result,
 )
 from backon._jitter import full_jitter
-from backon._retry import _retry_async, _retry_sync
+from backon._retry import _retry_async_inner, _retry_sync_inner
 from backon._state import RetryState
 from backon._typing import (
     P,
@@ -54,10 +54,13 @@ def on_predicate(
     retry_error_callback: Callable[[dict], Any] | None = None,
     raise_on_giveup: bool = True,
     sleep: Callable[[float], Any] | None = None,
+    before: _Handler | Iterable[_Handler] | None = None,
+    after: _Handler | Iterable[_Handler] | None = None,
     **wait_gen_kwargs: Any,
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
     def decorate(target: Callable[P, R]) -> Callable[P, R]:
         nonlocal logger, on_success, on_backoff, on_giveup, on_attempt, before_sleep
+        nonlocal before, after
 
         logger = _prepare_logger(logger)
         on_success = _config_handlers(on_success)
@@ -75,6 +78,8 @@ def on_predicate(
         )
         on_attempt = _config_handlers(on_attempt)
         before_sleep = _config_handlers(before_sleep)
+        before = _config_handlers(before)
+        after = _config_handlers(after)
 
         condition: RetryCondition = retry_if_result(predicate)
 
@@ -91,7 +96,7 @@ def on_predicate(
 
                 return cast(
                     R,
-                    await _retry_async(
+                    await _retry_async_inner(
                         wrapped,
                         wait_gen,
                         condition=condition,
@@ -107,6 +112,8 @@ def on_predicate(
                         retry_error_callback=retry_error_callback,
                         raise_on_giveup=raise_on_giveup,
                         wait_gen_kwargs=wait_gen_kwargs,
+                        before=before,
+                        after=after,
                     ),
                 )
 
@@ -121,7 +128,7 @@ def on_predicate(
 
                 return cast(
                     R,
-                    _retry_sync(
+                    _retry_sync_inner(
                         lambda: target(*args, **kwargs),
                         wait_gen,
                         condition=condition,
@@ -137,6 +144,8 @@ def on_predicate(
                         retry_error_callback=retry_error_callback,
                         raise_on_giveup=raise_on_giveup,
                         wait_gen_kwargs=wait_gen_kwargs,
+                        before=before,
+                        after=after,
                     ),
                 )
 
@@ -164,10 +173,13 @@ def on_exception(
     backoff_log_level: int = logging.INFO,
     giveup_log_level: int = logging.ERROR,
     sleep: Callable[[float], Any] | None = None,
+    before: _Handler | Iterable[_Handler] | None = None,
+    after: _Handler | Iterable[_Handler] | None = None,
     **wait_gen_kwargs: Any,
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
     def decorate(target: Callable[P, R]) -> Callable[P, R]:
         nonlocal logger, on_success, on_backoff, on_giveup, on_attempt, before_sleep
+        nonlocal before, after
 
         logger = _prepare_logger(logger)
         on_success = _config_handlers(on_success)
@@ -185,6 +197,8 @@ def on_exception(
         )
         on_attempt = _config_handlers(on_attempt)
         before_sleep = _config_handlers(before_sleep)
+        before = _config_handlers(before)
+        after = _config_handlers(after)
 
         exc_types: tuple[type[Exception], ...]
         if isinstance(exception, type):
@@ -217,7 +231,7 @@ def on_exception(
 
                 return cast(
                     R,
-                    await _retry_async(
+                    await _retry_async_inner(
                         wrapped,
                         wait_gen,
                         condition=condition,
@@ -233,6 +247,8 @@ def on_exception(
                         retry_error_callback=retry_error_callback,
                         raise_on_giveup=raise_on_giveup,
                         wait_gen_kwargs=wait_gen_kwargs,
+                        before=before,
+                        after=after,
                     ),
                 )
 
@@ -247,7 +263,7 @@ def on_exception(
 
                 return cast(
                     R,
-                    _retry_sync(
+                    _retry_sync_inner(
                         lambda: target(*args, **kwargs),
                         wait_gen,
                         condition=condition,
@@ -263,6 +279,8 @@ def on_exception(
                         retry_error_callback=retry_error_callback,
                         raise_on_giveup=raise_on_giveup,
                         wait_gen_kwargs=wait_gen_kwargs,
+                        before=before,
+                        after=after,
                     ),
                 )