Improved throttling and now possible to disable it

Author: sergioteula

README.md

@@ -65,9 +65,10 @@ Usage guide
 
 **Throttling:**
 
-Throttling value must be `0 < value <= 1`. This value throttles requests to a maximum of one request per `1 / value` seconds. Note that this value is a per-worker throttling, so applications with multiple workers may make more requests per second. Throttling value is [set by default](https://github.com/sergioteula/python-amazon-paapi/blob/master/amazon/paapi.py#L36) to `0.8` or one request per 1.25 seconds.
+Throttling value must be `greater than 0` or `False` to disable it. This value throttles requests to a maximum of one request every `1 / value` seconds. Note that this value is a per-worker throttling, so applications with multiple workers may make more requests per second. Throttling value is [set by default](https://github.com/sergioteula/python-amazon-paapi/blob/master/amazon/paapi.py#L36) to `0.8` or one request every 1.25 seconds.
 
     amazon = AmazonAPI(KEY, SECRET, TAG, COUNTRY, throttling=0.5)  # Max one request every two seconds
+    amazon = AmazonAPI(KEY, SECRET, TAG, COUNTRY, throttling=False)  # Unlimited requests per second
 
 Changelog
 -------------

amazon/__init__.py

@@ -1,4 +1,4 @@
 """Amazon Product Advertising API wrapper for Python"""
 
-__version__ = '3.0.2'
+__version__ = '3.1.0'
 __author__ = 'Sergio Abad'

amazon/paapi.py

@@ -30,19 +30,24 @@ class AmazonAPI:
         tag (str): The tag you want to use for the URL.
         country (str): Country code. Use one of the following:
             AU, BR, CA, FR, DE, IN, IT, JP, MX, ES, TR, AE, UK, US.
-        throttling (float, optional): Reduce this value to wait longer
-            between API calls.
+        throttling (float, optional): It should be greater than 0 or False to disable throttling.
+        This value determines wait time between API calls.
     """
     def __init__(self, key: str, secret: str, tag: str, country: str, throttling=0.8):
         self.key = key
         self.secret = secret
         self.tag = tag
-        if 1 >= throttling > 0:
-            self.throttling = throttling
-        elif throttling <= 0:
-            raise AmazonException('ValueError', 'Throttling should be greater than 0')
-        elif throttling > 1:
-            raise AmazonException('ValueError', 'Throttling should be 1 or less')
+        try:
+            if throttling is True:
+                raise ValueError
+            elif throttling is False:
+                self.throttling = False
+            else:
+                self.throttling = float(throttling)
+                if not self.throttling > 0:
+                    raise ValueError
+        except ValueError:
+            raise AmazonException('ValueError', 'Throttling should be False or greater than 0')
         self.country = country
         try:
             self.host = 'webservices.amazon.' + DOMAINS[country]
@@ -101,9 +106,10 @@ def get_products(self, product_ids: [str, list], condition='Any', merchant='All'
             for x in range(3):
                 try:
                     # Wait before doing the request
-                    wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
-                    if wait_time > 0:
-                        time.sleep(wait_time)
+                    if self.throttling:
+                        wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
+                        if wait_time > 0:
+                            time.sleep(wait_time)
                     self.last_query_time = time.time()
 
                     # Send the request and create results
@@ -260,9 +266,10 @@ def search_products(self, item_count=10, item_page=1, items_per_page=10, keyword
             for x in range(3):
                 try:
                     # Wait before doing the request
-                    wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
-                    if wait_time > 0:
-                        time.sleep(wait_time)
+                    if self.throttling:
+                        wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
+                        if wait_time > 0:
+                            time.sleep(wait_time)
                     self.last_query_time = time.time()
 
                     # Send the request and create results
@@ -351,9 +358,10 @@ def get_variations(self, asin, item_count=10, item_page=1, items_per_page=10, co
             for x in range(3):
                 try:
                     # Wait before doing the request
-                    wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
-                    if wait_time > 0:
-                        time.sleep(wait_time)
+                    if self.throttling:
+                        wait_time = 1 / self.throttling - (time.time() - self.last_query_time)
+                        if wait_time > 0:
+                            time.sleep(wait_time)
                     self.last_query_time = time.time()
 
                     # Send the request and create results

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='python-amazon-paapi',
-    version='3.0.2',
+    version='3.1.0',
     author='Sergio Abad',
     author_email='sergio.abad@bytelix.com',
     description='Amazon Product Advertising API 5.0 wrapper for Python',