From 305b0102257de75a0988a8af0b448a3544c43406 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 5 Mar 2019 11:12:58 +0100 Subject: [PATCH 1/3] Pass the response through the exception object --- .../python/cartodb_services/cartodb_services/tomtom/geocoder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py b/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py index f387bba..d20306b 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py +++ b/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py @@ -76,7 +76,7 @@ class TomTomGeocoder(Traceable): response = self.geocode_meta(searchtext, city, state_province, country) error_message = response[1].get('error', None) if error_message: - raise ServiceException(error_message, None) + raise ServiceException(error_message, response) else: return response[0] From ec2fe14ed39b34382176bab32cd29d5151d5b8da Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 5 Mar 2019 11:33:25 +0100 Subject: [PATCH 2/3] Pass http response to ServiceException --- .../cartodb_services/tomtom/geocoder.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py b/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py index d20306b..5e1ac5b 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py +++ b/server/lib/python/cartodb_services/cartodb_services/tomtom/geocoder.py @@ -73,12 +73,12 @@ class TomTomGeocoder(Traceable): @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) - error_message = response[1].get('error', None) + geocoder_response, http_response = self.geocode_meta(searchtext, city, state_province, country) + error_message = geocoder_response[1].get('error', None) if error_message: - raise ServiceException(error_message, response) + raise ServiceException(error_message, http_response) else: - return response[0] + return geocoder_response[0] @qps_retry(qps=5, provider='tomtom') def geocode_meta(self, searchtext, city=None, state_province=None, @@ -93,7 +93,7 @@ class TomTomGeocoder(Traceable): country = country.decode('utf-8') if not self._validate_input(searchtext, city, state_province, country): - return EMPTY_RESPONSE + return (EMPTY_RESPONSE, None) address = [] if searchtext and searchtext.strip(): @@ -107,18 +107,18 @@ class TomTomGeocoder(Traceable): try: response = requests.get(uri) - return self._parse_response(response.status_code, response.text) + return (self._parse_response(response.status_code, response.text), response) except requests.Timeout as te: # In case of timeout we want to stop the job because the server # could be down msg = 'Timeout connecting to TomTom geocoding server' self._logger.error(msg, te) - return geocoder_error_response(msg) + return (geocoder_error_response(msg), None) except requests.ConnectionError as ce: # Don't raise the exception to continue with the geocoding job self._logger.error('Error connecting to TomTom geocoding server', exception=ce) - return EMPTY_RESPONSE + return (EMPTY_RESPONSE, None) def _parse_response(self, status_code, text): if status_code == requests.codes.ok: From 6a57a85e724d65fd915b8d5c8467c11201d48fe0 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 5 Mar 2019 11:55:40 +0100 Subject: [PATCH 3/3] Release new python lib version 0.21.3 --- NEWS.md | 7 ++++++- server/lib/python/cartodb_services/setup.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 0b19901..5470a5b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,12 @@ +Mar 5th, 2019 +============== +* Version `0.21.3` of the python library + * Fixed TomTom Qps respondes part 2 (#546) + Mar 4th, 2019 ============== * Version `0.21.2` of the python library - * Fixed TomTom Qps respondes (#546) + * Fixed TomTom Qps responses (#546) Feb 25th, 2019 ============== diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 2bb7691..d4f2a25 100644 --- 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.21.2', + version='0.21.3', description='CartoDB Services API Python Library',