cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added properties instead of getters

Browse Source
This commit is contained in:
Mario de Frutos 2015-11-10 16:49:27 +01:00
parent 7eab3e1f90
commit 29ec5da86d
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/lib/python/cartodb_geocoder/cartodb_geocoder/quota_service.py
View File

@ -7,19 +7,20 @@ class QuotaService:
def __init__(self, logger, user_id, transaction_id, **kwargs):
self.logger = logger
self.user_service = user_service.UserService(logger, user_id, **kwargs)
self._user_service = user_service.UserService(logger, user_id, **kwargs)
self.transaction_id = transaction_id
def check_user_quota(self):
""" Check if the current user quota surpasses the current quota """
# TODO We need to add the hard/soft limit flag for the geocoder
user_quota = self.user_service.get_user_quota()
current_used = self.user_service.get_current_used_quota()
user_quota = self.user_service.user_quota()
current_used = self.user_service.used_quota_month()
self.logger.debug("User quota: {0} --- Current used quota: {1}".format(user_quota, current_used))
return True if (current_used + 1) < user_quota else False
def increment_geocoder_use(self, amount=1):
self.user_service.increment_geocoder_use(self.transaction_id)
def get_user_service(self):
return self.user_service
@property
def user_service(self):
return self._user_service

21
server/lib/python/cartodb_geocoder/cartodb_geocoder/user_service.py
View File

@ -18,32 +18,33 @@ class UserService:
self.user_id = user_id
self.logger = logger
if self.REDIS_CONNECTION_KEY in kwargs:
self.redis_connection = self.__get_redis_connection(redis_connection=kwargs[self.REDIS_CONNECTION_KEY])
self._redis_connection = self.__get_redis_connection(redis_connection=kwargs[self.REDIS_CONNECTION_KEY])
else:
if self.REDIS_CONNECTION_HOST not in kwargs:
raise "You have to provide redis configuration"
redis_config = self.__build_redis_config(kwargs)
self.redis_connection = self.__get_redis_connection(redis_config = redis_config)
self._redis_connection = self.__get_redis_connection(redis_config = redis_config)
def get_user_quota(self):
def user_quota(self):
# Check for exceptions or redis timeout
user_quota = self.redis_connection.hget(self.__get_user_redis_key(), self.GEOCODING_QUOTA_KEY)
user_quota = self._redis_connection.hget(self.__get_user_redis_key(), self.GEOCODING_QUOTA_KEY)
return int(user_quota) if user_quota else 0
def get_current_used_quota(self):
def used_quota_month(self):
""" Recover the used quota for the user in the current month """
# Check for exceptions or redis timeout
current_used = 0
for _, value in self.redis_connection.hscan_iter(self.__get_month_redis_key()):
for _, value in self._redis_connection.hscan_iter(self.__get_month_redis_key()):
current_used += int(value)
return current_used
def increment_geocoder_use(self, key, amount=1):
# TODO Manage exceptions or timeout
self.redis_connection.hincrby(self.__get_month_redis_key(),key,amount)
self._redis_connection.hincrby(self.__get_month_redis_key(),key,amount)
def get_redis_connection(self):
return self.redis_connection
@property
def redis_connection(self):
return self._redis_connection
def __get_redis_connection(self, redis_connection=None, redis_config=None):
if redis_connection:
@ -61,7 +62,7 @@ class UserService:
def __build_redis_config(self, config):
redis_host = config[self.REDIS_CONNECTION_HOST] if self.REDIS_CONNECTION_HOST in config else self.REDIS_DEFAULT_HOST
redis_port = config[self.REDIS_CONNECTION_PORT] if self.REDIS_CONNECTION_PORT in config else self.REDIS_CONNECTION_PORT
redis_port = config[self.REDIS_CONNECTION_PORT] if self.REDIS_CONNECTION_PORT in config else self.REDIS_DEFAULT_PORT
redis_db = config[self.REDIS_CONNECTION_DB] if self.REDIS_CONNECTION_DB in config else self.REDIS_DEFAULT_USER_DB
return {'host': redis_host, 'port': redis_port, 'db': redis_db}

2
server/lib/python/cartodb_geocoder/example/server_func_example.sql
View File

@ -18,7 +18,7 @@ $$
result = plpy.execute("SELECT geom FROM geocode_admin0_polygons(Array[\'{0}\']::text[])".format(search))
if result.status() == 5 and result.nrows() == 1:
qs.increment_geocoder_use()
SD[user_id] = {tx_id: {'redis_connection': qs.get_user_service().get_redis_connection()}}
SD[user_id] = {tx_id: {'redis_connection': qs.user_service.redis_connection}}
return result[0]["geom"]
else:
raise Exception('Something wrong with the georefence operation')