RP fixes

Author: NikitaKozlovtcev

circuit_breaker_box/__init__.py

@@ -2,17 +2,17 @@
 from circuit_breaker_box.circuit_breaker_in_memory import CircuitBreakerInMemory
 from circuit_breaker_box.common_types import ResponseType
 from circuit_breaker_box.errors import BaseCircuitBreakerError, HostUnavailableError
-from circuit_breaker_box.retryer_base import BaseRetryer
-from circuit_breaker_box.retryers import Retryer, RetryerCircuitBreaker
+from circuit_breaker_box.retryer_base import BaseRetrier
+from circuit_breaker_box.retryers import Retrier, RetrierCircuitBreaker
 
 
 __all__ = [
     "BaseCircuitBreaker",
     "BaseCircuitBreakerError",
-    "BaseRetryer",
+    "BaseRetrier",
     "CircuitBreakerInMemory",
     "HostUnavailableError",
     "ResponseType",
-    "Retryer",
-    "RetryerCircuitBreaker",
+    "Retrier",
+    "RetrierCircuitBreaker",
 ]

circuit_breaker_box/retryer_base.py

@@ -14,7 +14,7 @@
 
 
 @dataclasses.dataclass(kw_only=True)
-class BaseRetryer(abc.ABC, typing.Generic[ResponseType]):
+class BaseRetrier(abc.ABC, typing.Generic[ResponseType]):
     max_retries: int
     reraise: bool = True
     exceptions_to_retry: tuple[type[Exception]]

circuit_breaker_box/retryers.py

@@ -4,7 +4,7 @@
 
 import tenacity
 
-from circuit_breaker_box import BaseCircuitBreaker, BaseRetryer, ResponseType, errors
+from circuit_breaker_box import BaseCircuitBreaker, BaseRetrier, ResponseType, errors
 
 
 logger = logging.getLogger(__name__)
@@ -13,7 +13,7 @@
 
 
 @dataclasses.dataclass(kw_only=True)
-class Retryer(BaseRetryer[ResponseType]):
+class Retrier(BaseRetrier[ResponseType]):
     async def retry(
         self,
         coroutine: typing.Callable[P, typing.Awaitable[ResponseType]],
@@ -34,7 +34,7 @@ async def retry(
 
 
 @dataclasses.dataclass(kw_only=True)
-class RetryerCircuitBreaker(BaseRetryer[ResponseType]):
+class RetrierCircuitBreaker(BaseRetrier[ResponseType]):
     circuit_breaker: BaseCircuitBreaker
 
     async def retry(

examples/example_retry.py

@@ -3,7 +3,7 @@
 
 import httpx
 
-from circuit_breaker_box.retryers import Retryer
+from circuit_breaker_box.retryers import Retrier
 
 
 MAX_RETRIES = 4
@@ -15,7 +15,7 @@
 
 async def main() -> None:
     logging.basicConfig(level=logging.DEBUG)
-    retryer = Retryer[httpx.Response](
+    retryer = Retrier[httpx.Response](
         max_retries=MAX_RETRIES,
         exceptions_to_retry=(ZeroDivisionError,),
     )

examples/example_retry_circuit_breaker.py

@@ -5,7 +5,7 @@
 import fastapi
 import httpx
 
-from circuit_breaker_box import CircuitBreakerInMemory, RetryerCircuitBreaker
+from circuit_breaker_box import CircuitBreakerInMemory, RetrierCircuitBreaker
 
 
 MAX_RETRIES = 4
@@ -27,7 +27,7 @@ async def main() -> None:
         max_failure_count=CIRCUIT_BREAKER_MAX_FAILURE_COUNT,
         max_cache_size=MAX_CACHE_SIZE,
     )
-    retryer = RetryerCircuitBreaker[httpx.Response](
+    retryer = RetrierCircuitBreaker[httpx.Response](
         circuit_breaker=circuit_breaker,
         max_retries=MAX_RETRIES,
         exceptions_to_retry=(ZeroDivisionError,),

tests/conftest.py

@@ -6,7 +6,7 @@
 import pytest
 from redis import asyncio as aioredis
 
-from circuit_breaker_box import CircuitBreakerInMemory, Retryer, RetryerCircuitBreaker
+from circuit_breaker_box import CircuitBreakerInMemory, Retrier, RetrierCircuitBreaker
 from circuit_breaker_box.circuit_breaker_redis import CircuitBreakerRedis
 from examples.example_retry_circuit_breaker import CustomCircuitBreakerInMemory
 
@@ -66,8 +66,8 @@ def fixture_custom_circuit_breaker_in_memory() -> CustomCircuitBreakerInMemory:
 
 
 @pytest.fixture(name="test_retry_without_circuit_breaker")
-def fixture_retry_without_circuit_breaker() -> Retryer[httpx.Response]:
-    return Retryer[httpx.Response](
+def fixture_retry_without_circuit_breaker() -> Retrier[httpx.Response]:
+    return Retrier[httpx.Response](
         max_retries=MAX_RETRIES,
         exceptions_to_retry=(ZeroDivisionError,),
     )
@@ -76,8 +76,8 @@ def fixture_retry_without_circuit_breaker() -> Retryer[httpx.Response]:
 @pytest.fixture(name="test_retry_custom_circuit_breaker_in_memory")
 def fixture_retry_custom_circuit_breaker_in_memory(
     test_custom_circuit_breaker_in_memory: CustomCircuitBreakerInMemory,
-) -> RetryerCircuitBreaker[httpx.Response]:
-    return RetryerCircuitBreaker[httpx.Response](
+) -> RetrierCircuitBreaker[httpx.Response]:
+    return RetrierCircuitBreaker[httpx.Response](
         circuit_breaker=test_custom_circuit_breaker_in_memory,
         max_retries=MAX_RETRIES,
         exceptions_to_retry=(ZeroDivisionError,),

tests/test_retriers.py

@@ -4,12 +4,12 @@
 import httpx
 import pytest
 
-from circuit_breaker_box import Retryer, RetryerCircuitBreaker
+from circuit_breaker_box import Retrier, RetrierCircuitBreaker
 from tests.conftest import SOME_HOST
 
 
 async def test_retry(
-    test_retry_without_circuit_breaker: Retryer[httpx.Response],
+    test_retry_without_circuit_breaker: Retrier[httpx.Response],
 ) -> None:
     test_request = httpx.AsyncClient().build_request(method="GET", url=SOME_HOST)
 
@@ -27,7 +27,7 @@ async def foo(request: httpx.Request) -> typing.NoReturn:  # noqa: ARG001
 
 
 async def test_retry_custom_circuit_breaker(
-    test_retry_custom_circuit_breaker_in_memory: RetryerCircuitBreaker[httpx.Response],
+    test_retry_custom_circuit_breaker_in_memory: RetrierCircuitBreaker[httpx.Response],
 ) -> None:
     test_request = httpx.AsyncClient().build_request(method="GET", url=SOME_HOST)