Merge pull request #528 from CartoDB/fix_qps_tomtom

Fix qps tomtom

server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py

@@ -70,7 +70,7 @@ class TomTomGeocoder(Traceable):
 
         return False
 
-    @qps_retry(qps=5)
+    @qps_retry(qps=5, provider='tomtom')
     def geocode(self, searchtext, city=None, state_province=None,
                 country=None):
         response = self.geocode_meta(searchtext, city, state_province, country)
@@ -80,7 +80,7 @@ class TomTomGeocoder(Traceable):
         else:
             return response[0]
 
-    @qps_retry(qps=5)
+    @qps_retry(qps=5, provider='tomtom')
     def geocode_meta(self, searchtext, city=None, state_province=None,
                 country=None):
         if searchtext:

server/lib/python/cartodb_services/cartodb_services/tomtom/routing.py

@@ -89,7 +89,7 @@ class TomTomRouting(Traceable):
                                  point[ENTRY_LONGITUDE]))
         return geometry
 
-    @qps_retry(qps=5)
+    @qps_retry(qps=5, provider='tomtom')
     def directions(self, waypoints, profile=DEFAULT_PROFILE,
                    date_time=DEFAULT_DEPARTAT):
         self._validate_profile(profile)

server/lib/python/cartodb_services/cartodb_services/tools/qps.py

@@ -6,6 +6,9 @@ from exceptions import TimeoutException
 DEFAULT_RETRY_TIMEOUT = 60
 DEFAULT_QUERIES_PER_SECOND = 10
 
+TOMTOM_403_RATE_LIMIT_HEADER = 'Account Over Queries Per Second Limit'
+TOMTOM_DETAIL_HEADER = 'X-Error-Detail-Header'
+
 
 def qps_retry(original_function=None, **options):
     """ Query Per Second retry decorator
@@ -46,6 +49,8 @@ class QPSService:
                 response = getattr(e, 'response', None)
                 if response is not None:
                     if self._provider is not None and self._provider == 'tomtom' and (response.status_code == 403):
+                        if response.headers.get(TOMTOM_DETAIL_HEADER) != TOMTOM_403_RATE_LIMIT_HEADER:
+                            raise e
                         self.retry(start_time, attempt_number)
                     elif response.status_code == 429:
                         self.retry(start_time, attempt_number)

server/lib/python/cartodb_services/setup.py

@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
 setup(
     name='cartodb_services',
 
-    version='0.20.1',
+    version='0.20.2',
 
     description='CartoDB Services API Python Library',