Merge branch 'microupdate-retries'-logic' into 'main'

remove unnecessary sleep after the last retry in RetryableExecutor.execute

See merge request kts-libs/python/extapi!1

Author: Igor Latkin

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.5
+* removed unnecessary `asyncio.sleep` after the last retry in `RetryableExecutor.execute`
+
 # 0.1.4
 * removed opentelemetry-sdk from dependencies
 

extapi/http/executors/retry.py

@@ -150,6 +150,9 @@ async def execute(self, request: RequestData) -> Response[T]:
                         e,
                     )
 
+            if retry >= self._max_retries - 1:
+                break
+
             if retry_sleep_timeout > 0:
                 await asyncio.sleep(retry_sleep_timeout)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "extapi"
-version = "0.1.4"
+version = "0.1.5"
 description = "External API library"
 authors = [
     { name = "KTS", email = "hello@kts.tech" }
@@ -49,6 +49,7 @@ tests = [
     "pytest",
     "pytest-asyncio",
     "pytest-aiohttp",
+    "pytest-mock",
     "coverage",
     "mypy",
     "ruff",

tests/exthttp/executors/test_retry.py

@@ -4,6 +4,7 @@
 from typing import Any
 
 import pytest
+from pytest_mock.plugin import MockerFixture
 
 from extapi.http.abc import AbstractExecutor, Addon
 from extapi.http.addons.auth import BearerAuthAddon
@@ -283,3 +284,20 @@ async def test_default_addons(self, request_simple: RequestData):
 
         assert response.status == 200
         assert base.call_count == 3
+
+    async def test_correct_sleep_count(
+        self, request_simple: RequestData, mocker: MockerFixture
+    ):
+        mock_sleep = mocker.patch("asyncio.sleep")
+        base = _DummyExecutor(responses=[500, 500])
+        executor = RetryableExecutor(
+            base,
+            max_retries=2,
+            retry_sleep_timeout=0.1,
+        )
+
+        response = await executor.execute(request_simple)
+
+        assert response.status == 500
+        assert base.call_count == 2
+        assert mock_sleep.await_count == 1