New version of the python lib

New release to change number of http connection retries to 1
Merge pull request #320 from CartoDB/317-revert-retries
2016-12-13 18:03:37 +01:00 · 2016-12-13 18:00:48 +01:00 · 2016-12-13 11:32:22 +01:00 · 2016-12-13 10:07:10 +01:00 · 2016-12-12 12:14:10 +01:00 · 2016-12-07 16:50:44 +01:00
7 changed files with 13 additions and 13 deletions
--- a/server/lib/python/cartodb_services/cartodb_services/here/geocoder.py
+++ b/server/lib/python/cartodb_services/cartodb_services/here/geocoder.py
@@ -18,7 +18,7 @@ class HereMapsGeocoder(Traceable):
    DEFAULT_GEN = 9
    READ_TIMEOUT = 60
    CONNECT_TIMEOUT = 10
-    MAX_RETRIES=3
+    MAX_RETRIES=1

    ADDRESS_PARAMS = [
        'city',
@@ -92,7 +92,7 @@ class HereMapsGeocoder(Traceable):
        request_params.update(params)
        # TODO Extract HTTP client wrapper
        session = requests.Session()
-        session.mount(self.host, HTTPAdapter(self.MAX_RETRIES))
+        session.mount(self.host, HTTPAdapter(max_retries=self.MAX_RETRIES))
        response = session.get(self.host, params=request_params,
                                timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
        self.add_response_data(response, self._logger)
--- a/server/lib/python/cartodb_services/cartodb_services/here/routing.py
+++ b/server/lib/python/cartodb_services/cartodb_services/here/routing.py
@@ -14,7 +14,7 @@ class HereMapsRoutingIsoline(Traceable):
    ISOLINE_PATH = '/routing/7.2/calculateisoline.json'
    READ_TIMEOUT = 60
    CONNECT_TIMEOUT = 10
-    MAX_RETRIES = 3
+    MAX_RETRIES = 1

    ACCEPTED_MODES = {
        "walk": "pedestrian",
@@ -57,7 +57,7 @@ class HereMapsRoutingIsoline(Traceable):
                                                         parsed_options)
        # TODO Extract HTTP client wrapper
        session = requests.Session()
-        session.mount(self._url, HTTPAdapter(self.MAX_RETRIES))
+        session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
        response = requests.get(self._url, params=request_params,
                                timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
        self.add_response_data(response, self._logger)
--- a/server/lib/python/cartodb_services/cartodb_services/mapzen/geocoder.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/geocoder.py
@@ -15,7 +15,7 @@ class MapzenGeocoder(Traceable):
    BASE_URL = 'https://search.mapzen.com/v1/search'
    READ_TIMEOUT = 60
    CONNECT_TIMEOUT = 10
-    MAX_RETRIES = 3
+    MAX_RETRIES = 1

    def __init__(self, app_key, logger, base_url=BASE_URL):
        self._app_key = app_key
@@ -31,7 +31,7 @@ class MapzenGeocoder(Traceable):
        try:
            # TODO Extract HTTP client wrapper
            session = requests.Session()
-            session.mount(self._url, HTTPAdapter(self.MAX_RETRIES))
+            session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
            response = session.get(self._url, params=request_params,
                                    timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
            self.add_response_data(response, self._logger)
--- a/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py
@@ -13,7 +13,7 @@ class MapzenIsochrones:
    BASE_URL = 'https://matrix.mapzen.com/isochrone'
    READ_TIMEOUT = 60
    CONNECT_TIMEOUT = 10
-    MAX_RETRIES = 3
+    MAX_RETRIES = 1

    ACCEPTED_MODES = {
        "walk": "pedestrian",
@@ -25,14 +25,14 @@ class MapzenIsochrones:
        self._url = base_url
        self._logger = logger

-    @qps_retry
+    @qps_retry(qps=7)
    def isochrone(self, locations, costing, ranges):
        request_params = self._parse_request_params(locations, costing,
                                                    ranges)
        try:
            # TODO Extract HTTP client wrapper
            session = requests.Session()
-            session.mount(self._url, HTTPAdapter(self.MAX_RETRIES))
+            session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
            response = session.get(self._url, params=request_params,
                                    timeout=(self.CONNECT_TIMEOUT,
                                            self.READ_TIMEOUT))
--- a/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
@@ -55,7 +55,7 @@ class QPSService:

    def retry(self, first_request_time, retry_count):
        elapsed = datetime.now() - first_request_time
-        if elapsed.microseconds  > (self._retry_timeout * 1000.0):
+        if elapsed.microseconds  > (self._retry_timeout * 1000.0 * 1000.0):
            raise TimeoutException()

        # inverse qps * (1.5 ^ i) is an increased sleep time of 1.5x per
--- a/server/lib/python/cartodb_services/cartodb_services/mapzen/routing.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/routing.py
@@ -15,7 +15,7 @@ class MapzenRouting(Traceable):
    PRODUCTION_ROUTING_BASE_URL = 'https://valhalla.mapzen.com/route'
    READ_TIMEOUT = 60
    CONNECT_TIMEOUT = 10
-    MAX_RETRIES=3
+    MAX_RETRIES=1

    ACCEPTED_MODES = {
        "walk": "pedestrian",
@@ -50,7 +50,7 @@ class MapzenRouting(Traceable):
        request_params = self.__parse_request_parameters(json_request_params)
        # TODO Extract HTTP client wrapper
        session = requests.Session()
-        session.mount(self._url, HTTPAdapter(self.MAX_RETRIES))
+        session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
        response = session.get(self._url, params=request_params,
                                timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
        self.add_response_data(response, self._logger)
--- a/server/lib/python/cartodb_services/setup.py
+++ b/server/lib/python/cartodb_services/setup.py
@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
 setup(
    name='cartodb_services',

-    version='0.12.1',
+    version='0.12.3',

    description='CartoDB Services API Python Library',
Author	SHA1	Message	Date
Javier Goizueta	4fc90626ab	New version of the python lib New release to change number of http connection retries to 1	2016-12-13 18:03:37 +01:00
Javier Goizueta	16cce3bddc	Merge pull request #320 from CartoDB/317-revert-retries Revert number of isochrone retries to 3	2016-12-13 18:00:48 +01:00
Javier Goizueta	1f53af65b9	Set number of http connection retries to 1 Change the maximum number of retries for connection to external services to 1.	2016-12-13 11:32:22 +01:00
Javier Goizueta	79fb796180	Fix bug in retries usage; mantain behaviour The number of retries was being passed as the pool size parameter. This is corrected but number of retries changed to 1 to maintain previous behaviour.	2016-12-13 10:07:10 +01:00
Javier Goizueta	2953fda75c	Revert num of isochrone retries to 3 See #317	2016-12-12 12:14:10 +01:00
Rafa de la Torre	f716fbb502	Merge pull request #318 from CartoDB/317-timeouts-patch 317 timeouts patch	2016-12-07 16:50:44 +01:00
Rafa de la Torre	98fa248fff	New version of the python lib #317	2016-12-07 16:39:28 +01:00
Rafa de la Torre	7c348dee0f	Mapzen isochrones: tweak retry params #317	2016-12-07 16:38:47 +01:00
Rafa de la Torre	bdeaadf33f	Fix QPS: Compare everything in microseconds #317	2016-12-07 16:37:25 +01:00