Helper atualizado para ter novas funções compatíveis com o life-cycle;

Biblioteca de logging melhorada como novos métodos;
Melhorias no boot para registrar a vendor de forma automática para o projeto poder ficar no padrão da pep8;

Author: andersoncontreira

examples/lambda_api/app.py

@@ -2,6 +2,7 @@
 
 This module contains the handler method
 """
+import boot
 import os
 import base64
 from lambda_app.services.v1.healthcheck import HealthCheckSchema
@@ -27,11 +28,10 @@
 from lambda_app.openapi import api_schemas
 from lambda_app.services.event_manager import EventManager
 from lambda_app import helper
-from lambda_app.boot import load_dot_env
 
 # load env
 ENV = helper.get_environment()
-load_dot_env(ENV)
+boot.load_dot_env(ENV)
 
 
 # config

examples/lambda_api/lambda_app/boot.py renamed to examples/lambda_api/boot.py

@@ -138,7 +138,7 @@ def load_env(env='dev', force=False):
 
     logger = get_internal_logger()
 
-    global _LOADED,_ENV_KEYS
+    global _LOADED, _ENV_KEYS
     if not _LOADED or force:
 
         logger.info('Boot - Loading env: {}'.format(env))
@@ -208,3 +208,6 @@ def print_env(app, logger):
     # logger.info('Database: %s' % os.getenv('DB_HOST'))
     logger.info('Log Level: %s' % os.getenv('LOG_LEVEL'))
     logger.info('Debug: %s' % os.getenv('DEBUG'))
+
+
+register_vendor()

examples/lambda_api/lambda_app/config.py

@@ -33,7 +33,7 @@ def to_dict(self):
 
     @staticmethod
     def get_env_keys():
-        from lambda_app.boot import get_env_keys
+        from boot import get_env_keys
         return get_env_keys()
 
 

examples/lambda_api/lambda_app/helper.py

@@ -7,7 +7,7 @@
 
 import pytz
 
-from lambda_app.logging import get_logger
+from lambda_app.logging import get_logger, get_console_logger
 
 TZ_AMERICA_SAO_PAULO = 'America/Sao_Paulo'
 
@@ -64,7 +64,6 @@ def to_dict(obj, force_str=False):
     if force_str:
         return {k: str(v) for k, v in data.items() if v is not None}
     else:
-        # return {k: v for k, v in data.items() if v is not None}
         _dict = {}
         for k, v in data.items():
             if isinstance(v, Enum):
@@ -78,7 +77,7 @@ def to_dict(obj, force_str=False):
 
 
 def to_json(obj):
-    return json.dumps(obj, default=str)
+    return json.dumps(obj)
 
 
 def debug_mode():
@@ -146,12 +145,19 @@ def is_https():
     return result
 
 
-def print_routes(app, logger):
+def is_count_request(app):
+    request = app.current_request.query_params
+    return True if request is not None and (request.get('count') == "true" or request.get('count') == "1") else False
+
+
+def print_routes(app, logger=None):
     """
     :param logger:
     :param (chalice.Chalice) app:
     :return:
     """
+    if logger is None:
+        logger = get_console_logger()
     logger.info('List of routes:')
 
     if has_attr(app, 'get_routes'):

examples/lambda_api/lambda_app/logging.py

@@ -14,6 +14,25 @@ def get_log_level():
     return log_level
 
 
+def get_console_logger():
+    log_level = get_log_level()
+    log_name = "console-{}".format(APP_NAME)
+    log_filename = None
+    log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    logging.basicConfig(format=log_format, filename=log_filename, level=log_level)
+    logger = logging.getLogger(log_name)
+    return logger
+
+
+def get_stream_handler():
+    return get_console_logger().parent.handlers[0]
+
+
+def set_debug_mode(logger, level=None):
+    logger.addHandler(get_stream_handler())
+    logger.level = level if level is not None else logging.INFO
+
+
 def get_logger():
     global _LOGGER
     if not _LOGGER:

examples/lambda_api/scripts/boot-lambda.sh

@@ -18,7 +18,6 @@ else
 fi
 
 current_file_path_basename=$(basename -- "$current_file_path")
-#echo "xxxxx current_file_path_basename $current_file_path_basename"
 
 if [ -z "$current_file_path_basename" ] || [ $current_file_path = "./" ]; then
 #  echo 'aq'
@@ -49,19 +48,13 @@ echo '----------------------------------------'
 echo 'Installing dependencies...'
 echo "Requirements file: ${current_parent_folder}requirements.txt"
 if test -f ${current_parent_folder}requirements.txt; then
-  # python3 -m pip install -r ${current_parent_folder}requirements.txt -t ${current_parent_folder}vendor
-  # Lets install the dependencies direct into the venv instead vendor folder
-#  python3 -m pip install -r ${current_parent_folder}requirements.txt -t ${current_parent_folder}
-#  cat ${current_parent_folder}requirements.txt
+  python3 -m pip install -r ${current_parent_folder}requirements.txt -t ${current_parent_folder}vendor
   echo "requirements..."
 fi
 
 echo "Requirements file: ${current_parent_folder}requirements-vendor.txt"
 if test -f ${current_parent_folder}requirements-vendor.txt; then
   python3 -m pip install -r ${current_parent_folder}requirements-vendor.txt -t ${current_parent_folder}vendor
-  # Lets install the dependencies direct into the venv instead vendor folder
-#  python3 -m pip install -r ${current_parent_folder}requirements-vendor.txt -t ${current_parent_folder}
-#  cat ${current_parent_folder}requirements-vendor.txt
   echo "requirements vendor..."
 fi
 

examples/lambda_api/scripts/migrations/mysql/migrate.py

@@ -36,7 +36,7 @@ def register_paths():
 register_paths()
 
 from lambda_app.logging import get_logger
-from lambda_app.boot import reset, load_dot_env, load_env
+from boot import reset, load_dot_env, load_env
 from lambda_app.config import reset as reset_config, get_config
 from lambda_app.database.mysql import get_connection
 

examples/lambda_api/tests/__init__.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-from lambda_app.boot import load_env, set_root_dir
+from boot import load_env, set_root_dir
 
 if __package__:
     current_path = os.path.abspath(os.path.dirname(__file__)).replace('/' + str(__package__), '', 1)

examples/lambda_api/tests/component/componenttestutils.py

@@ -3,7 +3,7 @@
 import unittest
 import warnings
 
-from lambda_app.boot import reset, load_dot_env, load_env
+from boot import reset, load_dot_env, load_env
 from lambda_app.config import reset as reset_config, get_config
 
 

examples/lambda_api/tests/component/test_app.py

@@ -92,7 +92,7 @@ def test_index(self):
         event = create_aws_api_gateway_proxy_request_event('GET', '/')
         context = FakeLambdaContext()
 
-        response = serverless_wsgi.handle_request(app.app, event, context)
+        response = serverless_wsgi.handle_request(app.APP, event, context)
 
         self.assertTrue('statusCode' in response)
         self.assertTrue('body' in response)
@@ -109,7 +109,7 @@ def test_alive(self):
         event = create_aws_api_gateway_proxy_request_event('GET', '/alive')
         context = FakeLambdaContext()
 
-        response = serverless_wsgi.handle_request(app.app, event, context)
+        response = serverless_wsgi.handle_request(app.APP, event, context)
 
         self.assertTrue('statusCode' in response)
         self.assertTrue('body' in response)