From 1505e0e6ea0a4810cc3c6d60d7da57011e784d83 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Thu, 31 Mar 2016 15:52:52 +0200 Subject: [PATCH 1/4] Make isoline credentials independent --- .../cartodb_services/metrics/config.py | 44 ++++++++++++------- server/lib/python/cartodb_services/setup.py | 2 +- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py index a729cb4..7731b0f 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py @@ -54,10 +54,10 @@ class IsolinesRoutingConfig(ServiceConfig): ROUTING_CONFIG_KEYS = ['here_isolines_quota', 'soft_here_isolines_limit', 'period_end_date', 'username', 'orgname', - 'heremaps_app_id', 'heremaps_app_code', + 'heremaps_isolines_app_id', 'heremaps_isolines_app_code', 'geocoder_type'] - NOKIA_APP_ID_KEY = 'heremaps_app_id' - NOKIA_APP_CODE_KEY = 'heremaps_app_code' + NOKIA_APP_ID_KEY = 'heremaps_isolines_app_id' + NOKIA_APP_CODE_KEY = 'heremaps_isolines_app_code' QUOTA_KEY = 'here_isolines_quota' SOFT_LIMIT_KEY = 'soft_here_isolines_limit' USERNAME_KEY = 'username' @@ -102,8 +102,8 @@ class IsolinesRoutingConfig(ServiceConfig): self._soft_isolines_limit = True else: self._soft_isolines_limit = False - self._heremaps_app_id = db_config.heremaps_app_id - self._heremaps_app_code = db_config.heremaps_app_code + self._heremaps_app_id = db_config.heremaps_isolines_app_id + self._heremaps_app_code = db_config.heremaps_isolines_app_code @property def service_type(self): @@ -168,12 +168,12 @@ class GeocoderConfig(ServiceConfig): GEOCODER_CONFIG_KEYS = ['google_maps_client_id', 'google_maps_api_key', 'geocoding_quota', 'soft_geocoding_limit', 'geocoder_type', 'period_end_date', - 'heremaps_app_id', 'heremaps_app_code', + 'heremaps_geocoder_app_id', 'heremaps_geocoder_app_code', 'mapzen_geocoder_app_key', 'username', 'orgname'] NOKIA_GEOCODER_REDIS_MANDATORY_KEYS = ['geocoding_quota', 'soft_geocoding_limit'] NOKIA_GEOCODER = 'heremaps' - NOKIA_GEOCODER_APP_ID_KEY = 'heremaps_app_id' - NOKIA_GEOCODER_APP_CODE_KEY = 'heremaps_app_code' + NOKIA_GEOCODER_APP_ID_KEY = 'heremaps_geocoder_app_id' + NOKIA_GEOCODER_APP_CODE_KEY = 'heremaps_geocoder_app_code' GOOGLE_GEOCODER = 'google' GOOGLE_GEOCODER_API_KEY = 'google_maps_api_key' GOOGLE_GEOCODER_CLIENT_ID = 'google_maps_client_id' @@ -241,8 +241,8 @@ class GeocoderConfig(ServiceConfig): else: self._soft_geocoding_limit = False if filtered_config[self.GEOCODER_TYPE].lower() == self.NOKIA_GEOCODER: - self._heremaps_app_id = db_config.heremaps_app_id - self._heremaps_app_code = db_config.heremaps_app_code + self._heremaps_app_id = db_config.heremaps_geocoder_app_id + self._heremaps_app_code = db_config.heremaps_geocoder_app_code self._cost_per_hit = db_config.heremaps_geocoder_cost_per_hit elif filtered_config[self.GEOCODER_TYPE].lower() == self.GOOGLE_GEOCODER: self._google_maps_api_key = filtered_config[self.GOOGLE_GEOCODER_API_KEY] @@ -338,10 +338,12 @@ class ServicesDBConfig: raise ConfigException('Here maps configuration missing') else: heremaps_conf = json.loads(heremaps_conf_json) - self._heremaps_app_id = heremaps_conf['app_id'] - self._heremaps_app_code = heremaps_conf['app_code'] - self._heremaps_geocoder_cost_per_hit = heremaps_conf[ + self._heremaps_geocoder_app_id = heremaps_conf['geocoder']['app_id'] + self._heremaps_geocoder_app_code = heremaps_conf['geocoder']['app_code'] + self._heremaps_geocoder_cost_per_hit = heremaps_conf['geocoder'][ 'geocoder_cost_per_hit'] + self._heremaps_isolines_app_id = heremaps_conf['isolines']['app_id'] + self._heremaps_isolines_app_code = heremaps_conf['isolines']['app_code'] def _get_mapzen_config(self): mapzen_conf_json = self._get_conf('mapzen_conf') @@ -369,12 +371,20 @@ class ServicesDBConfig: raise ConfigException("Malformed config for {0}: {1}".format(key, e)) @property - def heremaps_app_id(self): - return self._heremaps_app_id + def heremaps_isolines_app_id(self): + return self._heremaps_isolines_app_id @property - def heremaps_app_code(self): - return self._heremaps_app_code + def heremaps_isolines_app_code(self): + return self._heremaps_isolines_app_code + + @property + def heremaps_geocoder_app_id(self): + return self._heremaps_geocoder_app_id + + @property + def heremaps_geocoder_app_code(self): + return self._heremaps_geocoder_app_code @property def heremaps_geocoder_cost_per_hit(self): diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 633f24c..de5dd35 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.4.0', + version='0.4.1', description='CartoDB Services API Python Library', From 5f74d012a6950c7a55b7b23cc338c79061981e9e Mon Sep 17 00:00:00 2001 From: Carla Date: Thu, 31 Mar 2016 16:22:02 +0200 Subject: [PATCH 2/4] Update 00_install_test files --- server/extension/test/expected/00_install_test.out | 2 +- server/extension/test/sql/00_install_test.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/extension/test/expected/00_install_test.out b/server/extension/test/expected/00_install_test.out index c69ea04..d6951fd 100644 --- a/server/extension/test/expected/00_install_test.out +++ b/server/extension/test/expected/00_install_test.out @@ -19,7 +19,7 @@ SELECT cartodb.cdb_conf_setconf('redis_metadata_config', '{"redis_host": "localh (1 row) -SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}'); +SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"geocoder": {"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}, "isolines": {"app_id": "dummy_id", "app_code": "dummy_code"}}'); cdb_conf_setconf ------------------ diff --git a/server/extension/test/sql/00_install_test.sql b/server/extension/test/sql/00_install_test.sql index 2e3cb2e..d86e983 100644 --- a/server/extension/test/sql/00_install_test.sql +++ b/server/extension/test/sql/00_install_test.sql @@ -11,7 +11,7 @@ CREATE EXTENSION cdb_dataservices_server; -- Mock the redis server connection to point to this very test db SELECT cartodb.cdb_conf_setconf('redis_metrics_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}'); SELECT cartodb.cdb_conf_setconf('redis_metadata_config', '{"redis_host": "localhost", "redis_port": 6379, "timeout": 0.1, "redis_db": 5}'); -SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}'); +SELECT cartodb.cdb_conf_setconf('heremaps_conf', '{"geocoder": {"app_id": "dummy_id", "app_code": "dummy_code", "geocoder_cost_per_hit": 1}, "isolines": {"app_id": "dummy_id", "app_code": "dummy_code"}}'); SELECT cartodb.cdb_conf_setconf('mapzen_conf', '{"routing_app_key": "dummy_key", "geocoder_app_key": "dummy_key"}'); SELECT cartodb.cdb_conf_setconf('logger_conf', '{"geocoder_log_path": "/dev/null"}'); From 62da0eff2129d8c52416d77b9ffe93d36c5657dd Mon Sep 17 00:00:00 2001 From: Carla Date: Thu, 31 Mar 2016 16:45:27 +0200 Subject: [PATCH 3/4] Update test_helper.py --- server/lib/python/cartodb_services/test/test_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/test/test_helper.py b/server/lib/python/cartodb_services/test/test_helper.py index 9856aca..349b043 100644 --- a/server/lib/python/cartodb_services/test/test_helper.py +++ b/server/lib/python/cartodb_services/test/test_helper.py @@ -44,7 +44,7 @@ def build_plpy_mock(empty=False): def _plpy_execute_side_effect(*args, **kwargs): if args[0] == "SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as conf": - return [{'conf': '{"app_id": "app_id", "app_code": "code", "geocoder_cost_per_hit": 1}'}] + return [{'conf': '{"geocoder": {"app_id": "app_id", "app_code": "code", "geocoder_cost_per_hit": 1}, "isolines": {"app_id": "app_id", "app_code": "code"}}'}] elif args[0] == "SELECT cartodb.CDB_Conf_GetConf('mapzen_conf') as conf": return [{'conf': '{"routing_app_key": "app_key", "geocoder_app_key": "app_key"}'}] elif args[0] == "SELECT cartodb.CDB_Conf_GetConf('logger_conf') as conf": From 8c5a4d32dee48e6166a3307a2081fea8cf087842 Mon Sep 17 00:00:00 2001 From: Carla Date: Fri, 1 Apr 2016 10:15:27 +0200 Subject: [PATCH 4/4] Update setup.py --- server/lib/python/cartodb_services/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index de5dd35..9285caa 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.4.1', + version='0.4.2', description='CartoDB Services API Python Library',