fixed typing

Author: NikitaKozlovtcev

circuit_breaker_box/retryer_base.py

@@ -17,7 +17,7 @@
 class BaseRetrier(abc.ABC, typing.Generic[ResponseType]):
     max_retries: int
     reraise: bool = True
-    exceptions_to_retry: tuple[type[Exception]]
+    exceptions_to_retry: tuple[type[Exception], ...]
     stop: tenacity.stop.stop_after_attempt = dataclasses.field(init=False)
     wait_strategy: tenacity.wait.wait_exponential_jitter = dataclasses.field(init=False)
     retry_cause: tenacity.retry_if_exception_type = dataclasses.field(init=False)
@@ -27,14 +27,6 @@ def __post_init__(self) -> None:
         self.wait_strategy = tenacity.wait_exponential_jitter()
         self.retry_cause = tenacity.retry_if_exception_type(self.exceptions_to_retry)
 
-    @abc.abstractmethod
-    async def retry(
-        self,
-        coroutine: typing.Callable[P, typing.Awaitable[ResponseType]],
-        *args: P.args,
-        **kwargs: P.kwargs,
-    ) -> ResponseType: ...
-
     @staticmethod
     def _log_attempts(retry_state: tenacity.RetryCallState) -> None:
         logger.info(

circuit_breaker_box/retryers.py

@@ -17,6 +17,7 @@ class Retrier(BaseRetrier[ResponseType]):
     async def retry(  # type: ignore[return]
         self,
         coroutine: typing.Callable[P, typing.Awaitable[ResponseType]],
+        /,
         *args: P.args,
         **kwargs: P.kwargs,
     ) -> ResponseType:
@@ -38,10 +39,12 @@ class RetrierCircuitBreaker(BaseRetrier[ResponseType]):
     async def retry(  # type: ignore[return]
         self,
         coroutine: typing.Callable[P, typing.Awaitable[ResponseType]],
+        /,
+        host: str,
         *args: P.args,
         **kwargs: P.kwargs,
     ) -> ResponseType:
-        if not (host := str(kwargs.get("host", ""))):
+        if not host:
             msg = "'host' argument should be defined"
             raise ValueError(msg)
 

examples/example_retry.py

@@ -24,7 +24,7 @@ async def main() -> None:
     async def foo(request: httpx.Request, host: str) -> httpx.Response:  # noqa: ARG001
         raise ZeroDivisionError
 
-    await retryer.retry(coroutine=foo, request=example_request, host=example_request.url.host)
+    await retryer.retry(foo, request=example_request, host=example_request.url.host)
 
 
 if __name__ == "__main__":

examples/example_retry_circuit_breaker.py

@@ -30,15 +30,15 @@ async def main() -> None:
     retryer = RetrierCircuitBreaker[httpx.Response](
         circuit_breaker=circuit_breaker,
         max_retries=MAX_RETRIES,
-        exceptions_to_retry=(ZeroDivisionError,),
+        exceptions_to_retry=(ZeroDivisionError, httpx.RequestError),
     )
     example_request = httpx.Request("GET", httpx.URL("http://example.com"))
 
-    async def foo(request: httpx.Request, host: str) -> httpx.Response:  # noqa: ARG001
+    async def foo(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
         raise ZeroDivisionError
 
     # will raise exception from circuit_breaker.raise_host_unavailable_error
-    await retryer.retry(coroutine=foo, request=example_request, host=example_request.url.host)
+    await retryer.retry(foo, example_request.url.host, example_request)
 
 
 if __name__ == "__main__":

tests/test_retriers.py

@@ -16,39 +16,36 @@ async def test_retry(
     async def bar(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
         return httpx.Response(status_code=httpx.codes.OK)
 
-    response = await test_retry_without_circuit_breaker.retry(coroutine=bar, request=test_request)
+    response = await test_retry_without_circuit_breaker.retry(bar, request=test_request)
     assert response.status_code == httpx.codes.OK
 
     async def foo(request: httpx.Request) -> typing.NoReturn:  # noqa: ARG001
         raise ZeroDivisionError
 
     with pytest.raises(ZeroDivisionError):
-        await test_retry_without_circuit_breaker.retry(coroutine=foo, request=test_request)
+        await test_retry_without_circuit_breaker.retry(foo, request=test_request)
 
 
 async def test_retry_custom_circuit_breaker(
     test_retry_custom_circuit_breaker_in_memory: RetrierCircuitBreaker[httpx.Response],
 ) -> None:
     test_request = httpx.AsyncClient().build_request(method="GET", url=SOME_HOST)
 
-    async def bar(request: httpx.Request, host: str) -> httpx.Response:  # noqa: ARG001
+    async def bar(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
         return httpx.Response(status_code=httpx.codes.OK)
 
-    response = await test_retry_custom_circuit_breaker_in_memory.retry(
-        coroutine=bar, request=test_request, host=test_request.url.host
-    )
+    response = await test_retry_custom_circuit_breaker_in_memory.retry(bar, test_request.url.host, request=test_request)
     assert response.status_code == httpx.codes.OK
 
-    async def foo(request: httpx.Request, host: str) -> typing.NoReturn:  # noqa: ARG001
+    async def foo(request: httpx.Request) -> typing.NoReturn:  # noqa: ARG001
         raise ZeroDivisionError
 
     with pytest.raises(fastapi.exceptions.HTTPException, match=f"500: Host: {test_request.url.host} is unavailable"):
-        await test_retry_custom_circuit_breaker_in_memory.retry(
-            coroutine=foo, request=test_request, host=test_request.url.host
-        )
+        await test_retry_custom_circuit_breaker_in_memory.retry(foo, host=test_request.url.host, request=test_request)
 
     with pytest.raises(ValueError, match="'host' argument should be defined"):
-        await test_retry_custom_circuit_breaker_in_memory.retry(  # type: ignore[call-arg]
-            coroutine=foo,
+        await test_retry_custom_circuit_breaker_in_memory.retry(
+            foo,
             request=test_request,
+            host="",
         )