OBS_GetData functions shall increase the DO quota usage

NEWS.md

@@ -1,3 +1,9 @@
+February 2st, 2017
+===================
+* Version 0.21.0 of the server and version 0.15.0 of the client
+  * Added functions `OBS_GetData` and `OBS_GetMeta`
+  * Default isolines provider changed to `mapzen` instead of `heremaps`
+
 November 29st, 2016
 ===================
 * Version 0.20.0 of the server and version 0.12.0 of the python library

server/extension/cdb_dataservices_server--0.20.0--0.21.0.sql

@@ -28,6 +28,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -38,19 +39,29 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4, $5);", ["text", "text", "geomval[]", "json", "boolean"])
         result = plpy.execute(obs_plan, [username, orgname, geomvals, params, merge])
+        empty_results = len(geomvals) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomvals))
         logger.error('Error trying to OBS_GetData', sys.exc_info(), data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomvals))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetData(
@@ -76,6 +87,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -86,21 +98,31 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4);", ["text", "text", "text[]", "json"])
         result = plpy.execute(obs_plan, [username, orgname, geomrefs, params])
+        empty_results = len(geomrefs) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomrefs))
         exc_info = sys.exc_info()
         logger.error('%s, %s, %s' % (exc_info[0], exc_info[1], exc_info[2]))
         logger.error('Error trying to OBS_GetData', exc_info, data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomrefs))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeta(

server/extension/cdb_dataservices_server--0.21.0.sql

@@ -730,6 +730,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -740,19 +741,29 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4, $5);", ["text", "text", "geomval[]", "json", "boolean"])
         result = plpy.execute(obs_plan, [username, orgname, geomvals, params, merge])
+        empty_results = len(geomvals) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomvals))
         logger.error('Error trying to OBS_GetData', sys.exc_info(), data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomvals))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetData(
@@ -778,6 +789,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -788,21 +800,31 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4);", ["text", "text", "text[]", "json"])
         result = plpy.execute(obs_plan, [username, orgname, geomrefs, params])
+        empty_results = len(geomrefs) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomrefs))
         exc_info = sys.exc_info()
         logger.error('%s, %s, %s' % (exc_info[0], exc_info[1], exc_info[2]))
         logger.error('Error trying to OBS_GetData', exc_info, data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomrefs))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeta(

server/extension/sql/110_data_observatory_augmentation.sql

@@ -593,6 +593,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -603,19 +604,29 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4, $5);", ["text", "text", "geomval[]", "json", "boolean"])
         result = plpy.execute(obs_plan, [username, orgname, geomvals, params, merge])
+        empty_results = len(geomvals) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomvals))
         logger.error('Error trying to OBS_GetData', sys.exc_info(), data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomvals))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetData(
@@ -641,6 +652,7 @@ RETURNS TABLE (
   data JSON
 ) AS $$
   from cartodb_services.metrics import metrics
+  from cartodb_services.metrics import QuotaService
   from cartodb_services.tools import Logger,LoggerConfig
 
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
@@ -651,21 +663,31 @@ RETURNS TABLE (
   plpy.execute("SELECT cdb_dataservices_server._get_logger_config()")
   logger_config = GD["logger_config"]
   logger = Logger(logger_config)
+  quota_service = QuotaService(user_obs_config, redis_conn)
+  if not quota_service.check_user_quota():
+    raise Exception('You have reached the limit of your quota')
 
   with metrics('obs_getdata', user_obs_config, logger):
     try:
         obs_plan = plpy.prepare("SELECT * FROM cdb_dataservices_server._OBS_GetData($1, $2, $3, $4);", ["text", "text", "text[]", "json"])
         result = plpy.execute(obs_plan, [username, orgname, geomrefs, params])
+        empty_results = len(geomrefs) - len(result)
+        if empty_results > 0:
+          quota_service.increment_empty_service_use(empty_results)
         if result:
+          quota_service.increment_success_service_use(len(result))
           return result
         else:
           return None
     except BaseException as e:
         import sys
+        quota_service.increment_failed_service_use(len(geomrefs))
         exc_info = sys.exc_info()
         logger.error('%s, %s, %s' % (exc_info[0], exc_info[1], exc_info[2]))
         logger.error('Error trying to OBS_GetData', exc_info, data={"username": username, "orgname": orgname})
         raise Exception('Error trying to OBS_GetData')
+    finally:
+        quota_service.increment_total_service_use(len(geomrefs))
 $$ LANGUAGE plpythonu;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server._OBS_GetMeta(