Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions raganything/resilience.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def decorator(func: F) -> F:
@functools.wraps(func)
def wrapper(*args: Any, **kwargs: Any) -> Any:
last_exception: BaseException | None = None
raw_delay = float(base_delay)
for attempt in range(1, max_attempts + 1):
try:
return func(*args, **kwargs)
Expand All @@ -117,7 +118,8 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
exc,
)
raise
delay = base_delay * (exponential_base ** (attempt - 1))
delay = raw_delay
raw_delay *= exponential_base
if jitter:
import random

Expand Down Expand Up @@ -187,6 +189,7 @@ def decorator(func: F) -> F:
@functools.wraps(func)
async def wrapper(*args: Any, **kwargs: Any) -> Any:
last_exception: BaseException | None = None
raw_delay = float(base_delay)
for attempt in range(1, max_attempts + 1):
try:
return await func(*args, **kwargs)
Expand All @@ -200,7 +203,8 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
exc,
)
raise
delay = base_delay * (exponential_base ** (attempt - 1))
delay = raw_delay
raw_delay *= exponential_base
if jitter:
import random

Expand Down
53 changes: 53 additions & 0 deletions tests/test_resilience.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,56 @@ async def extra_call():
task.cancel()
with pytest.raises(asyncio.CancelledError):
await task


@pytest.mark.parametrize("base_delay, jitter", [(1.0, False), (1, True)])
def test_capped_retry_does_not_overflow(monkeypatch, base_delay, jitter):
delays = []
monkeypatch.setattr(resilience_module.time, "sleep", delays.append)
calls = 0

@retry(
max_attempts=350,
base_delay=base_delay,
max_delay=0.0,
exponential_base=10.0,
jitter=jitter,
)
def operation():
nonlocal calls
calls += 1
if calls < 350:
raise ConnectionError("retry")
return "recovered"

assert operation() == "recovered"
assert delays == [0.0] * 349


@pytest.mark.asyncio
@pytest.mark.parametrize("base_delay, jitter", [(1.0, False), (1, True)])
async def test_capped_async_retry_does_not_overflow(monkeypatch, base_delay, jitter):
delays = []

async def sleep(delay):
delays.append(delay)

monkeypatch.setattr(resilience_module.asyncio, "sleep", sleep)
calls = 0

@async_retry(
max_attempts=350,
base_delay=base_delay,
max_delay=0.0,
exponential_base=10.0,
jitter=jitter,
)
async def operation():
nonlocal calls
calls += 1
if calls < 350:
raise ConnectionError("retry")
return "recovered"

assert await operation() == "recovered"
assert delays == [0.0] * 349
Loading