feature: adjusts retry strategies

Author: IvanildoBarauna

src/api_to_dataframe/models/retainer.py

@@ -1,5 +1,6 @@
 import time
 from enum import Enum
+
 from requests.exceptions import RequestException
 from api_to_dataframe.utils.logger import log, LogLevel
 from api_to_dataframe.utils import Constants
@@ -17,7 +18,7 @@ def wrapper(*args, **kwargs):  # pylint: disable=inconsistent-return-statements
         while retry_number < args[0].retries:
             try:
                 log(
-                    f"Trying for the {retry_number + 1} of {args[0].retries} retries. "
+                    f"Trying for the {retry_number} of {args[0].retries} retries. "
                     f"Using {args[0].retry_strategy}",
                     LogLevel.INFO,
                 )
@@ -28,11 +29,11 @@ def wrapper(*args, **kwargs):  # pylint: disable=inconsistent-return-statements
                 if args[0].retry_strategy == Strategies.NO_RETRY_STRATEGY:
                     raise e
                 if args[0].retry_strategy == Strategies.LINEAR_RETRY_STRATEGY:
-                    time.sleep(args[0].initial_delay)
+                    time.sleep(args[0].delay)
                 elif args[0].retry_strategy == Strategies.EXPONENTIAL_RETRY_STRATEGY:
-                    time.sleep(args[0].initial_delay * retry_number)
+                    time.sleep(args[0].delay * retry_number)
 
-                if retry_number == args[0].retries or retry_number == Constants.MAX_OF_RETRIES:
+                if retry_number in (args[0].retries, Constants.MAX_OF_RETRIES):
                     log(
                         f"Failed after {retry_number} retries using {args[0].retry_strategy}",
                         LogLevel.ERROR,

src/api_to_dataframe/utils/__init__.py

@@ -1,2 +1,2 @@
 class Constants:
-    MAX_OF_RETRIES = 5
+    MAX_OF_RETRIES = 5

tests/test_controller_client_builder.py

@@ -1,6 +1,5 @@
 import pytest
 import pandas as pd
-import requests
 
 from api_to_dataframe import ClientBuilder
 

tests/test_models_retainer.py

@@ -4,6 +4,8 @@
 
 from api_to_dataframe import ClientBuilder, RetryStrategies
 
+# from api_to_dataframe.utils import Constants
+
 
 def test_linear_strategy():
     endpoint = "https://api-to-dataframe/"
@@ -60,7 +62,7 @@ def test_exponential_strategy():
             client.get_api_data()
         except requests.exceptions.RequestException:
             end = time.time()
-            assert end - start >= client.delay * 2**retry_number
+            assert end - start >= client.delay * retry_number
             retry_number += 1
 
     assert retry_number == max_retries