acai-aws 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

acai_aws/common/logger/common_logger.py

@@ -3,14 +3,14 @@ import os
 import traceback
 
 import jsonpickle
-from icecream import ic
 
 
 class CommonLogger:
 
     def __init__(self):
         self.__json = jsonpickle
-        self.__format = os.getenv('LOG_FORMAT', 'JSON')
+        env_format = os.getenv('LOG_FORMAT', 'JSON') or 'JSON'
+        self.__format = env_format.strip().upper()
         self.__log_level = os.getenv('LOG_LEVEL', 'INFO')
         self.__json.set_encoder_options('simplejson', use_decimal=True)
         self.__json.set_preferred_backend('simplejson')
@@ -44,13 +44,17 @@ class CommonLogger:
         print(self.__json.encode({
             'level': kwargs['level'],
             'time': datetime.datetime.now(datetime.timezone.utc).isoformat(),
-            'error_trace': [trace.strip() for trace in self.__get_traceback().split('\n') if trace],
+            'trace': [trace.strip() for trace in self.__get_traceback().split('\n') if trace],
             'log': kwargs['log']
         }, indent=4))
 
     def __log_inline(self, **kwargs):
-        trace = self.__get_traceback()
-        prefix = f"{trace}{kwargs['level']}|"
-        log = kwargs['log']
-        ic.configureOutput(prefix=prefix, outputFunction=print)
-        ic(log)
+        timestamp = datetime.datetime.now(datetime.timezone.utc).isoformat()
+        trace = self.__get_traceback().strip().replace('\n', ' | ')
+        log_value = kwargs['log']
+        if not isinstance(log_value, str):
+            log_value = str(log_value)
+        inline_message = f"{kwargs['level']}|time={timestamp} log={log_value}"
+        if trace:
+            inline_message = f"{inline_message} trace={trace}"
+        print(inline_message)

{acai_aws-2.2.8.dist-info → acai_aws-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acai_aws
-Version: 2.2.8
+Version: 2.3.0
 Summary: DRY, configurable, declarative framework for building AWS Lambda APIs and event processors
 Home-page: https://github.com/syngenta/acai-python
 Author: Paul Cruse III

{acai_aws-2.2.8.dist-info → acai_aws-2.3.0.dist-info}/RECORD

@@ -26,7 +26,7 @@ acai_aws/common/json_helper.py,sha256=HoCaF0fO_EXcVbwanZ9Cg66x9oQUQyXbEdLfResFpq
 acai_aws/common/schema.py,sha256=mbtD922dsNzZX2uZjJKXFVj9IShpgBRofTVmdNyLGyE,3549
 acai_aws/common/validator.py,sha256=uYFMPGM5dvsiKxuwFGxetwqGcRNm03BZ3YJ6lNedwck,6575
 acai_aws/common/logger/__init__.py,sha256=2ItzGhXLdTwt9tKAOa5dzgQlLouJKQbUhV4qjxBLl1g,241
-acai_aws/common/logger/common_logger.py,sha256=bcOs1HRhqLHOp5P6tZQ821tqfSa7x_oBHrlY5o0lCWk,1977
+acai_aws/common/logger/common_logger.py,sha256=sGtTjDSqqXhVauGR06SuUWdYfxOrgzQcEswdrC5WIu0,2263
 acai_aws/common/logger/decorator.py,sha256=Nf7S--7mWKVkKiRB2fVNM9B4NBFpJeTGv0FYxK0DEvU,749
 acai_aws/common/records/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 acai_aws/common/records/event.py,sha256=F6fqxSRWfAbEH8n_Vw9ZQICcNd__rWRGpMv1T0deQ8o,621
@@ -72,7 +72,7 @@ acai_aws/sqs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 acai_aws/sqs/event.py,sha256=u5QYrb-XLy2mhzi3v55je6N6vASS3ywzjIBDjm_n32Q,264
 acai_aws/sqs/record.py,sha256=b-9gidW2UvuSZU00sgZV90DuUj7r12zTXYbQLNBSYjk,1909
 acai_aws/sqs/requirements.py,sha256=4QR0LIrDqF1CPSAroscX3EAys-dbqWMFmOhqyILcViw,116
-acai_aws-2.2.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+acai_aws-2.3.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/acai_aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/acai_aws/apigateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -107,7 +107,7 @@ tests/acai_aws/apigateway/router/test_pattern_router.py,sha256=981DrtlSSfaWSiDMQ
 tests/acai_aws/apigateway/router/test_timeout.py,sha256=Jv5Bk3s91kL4lBQAxxQ3NzjLnpKbeg845w4GpLwLkZA,2546
 tests/acai_aws/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/acai_aws/common/test_json_helper.py,sha256=P7kw_KIaVQFr9JQAFHd4jdbvg1uVQ5l5pQmx8HmFg88,1389
-tests/acai_aws/common/test_logger.py,sha256=LFpZyDSoibg_rl82PMRn83uf7CvR0slH7g9wK7gaKeQ,4639
+tests/acai_aws/common/test_logger.py,sha256=Aq4o43embLWofq9gG-JCY4nH4ohIqjdkwAU9nsrqkDE,5906
 tests/acai_aws/common/test_schema.py,sha256=WbSBwYGrdraF3EtuDB9XWYREKk_W14317jrTXEo90xY,5658
 tests/acai_aws/common/test_validator.py,sha256=9hDpf-UGCrQ1Elx0Th8wezLQ0HkUoKj-UXuLDGT5GJU,5958
 tests/acai_aws/common/records/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -154,7 +154,7 @@ tests/acai_aws/sqs/test_event.py,sha256=d8JBttuLND_qBVdLAoqtp-_qJ5NXxD6Ai2IFmUqK
 tests/acai_aws/sqs/test_record.py,sha256=RkWpc24A-f4bw1VyMM5mEp97QCk4i-Weu6CFP0-VlbU,1602
 tests/acai_aws/sqs/test_requirements.py,sha256=wcV99aXQIL8t6gIeUO0EgX9c_hA0IV3rg2Ar1g1SYjg,904
 tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-acai_aws-2.2.8.dist-info/METADATA,sha256=Cz5u7mer7vBN8vaBGkJTkBZeB_PhvRIl3IDLlIYlZdc,15175
-acai_aws-2.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-acai_aws-2.2.8.dist-info/top_level.txt,sha256=A6vdhfU7MqNqO9rGdH1Z2EEqpnbIIyb4PsHJbRktbbI,15
-acai_aws-2.2.8.dist-info/RECORD,,
+acai_aws-2.3.0.dist-info/METADATA,sha256=R1dle_WYWbBAOHTz8LcghQL7VgCj5MkIkKFdNtRtlG8,15175
+acai_aws-2.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+acai_aws-2.3.0.dist-info/top_level.txt,sha256=A6vdhfU7MqNqO9rGdH1Z2EEqpnbIIyb4PsHJbRktbbI,15
+acai_aws-2.3.0.dist-info/RECORD,,

tests/acai_aws/common/test_logger.py

@@ -1,4 +1,7 @@
+import io
+import json
 import os
+from contextlib import redirect_stdout
 from unittest import TestCase, mock
 
 from acai_aws.common import logger
@@ -54,6 +57,29 @@ class LoggerTest(TestCase):
         except Exception as error:
             logger.log(level='ERROR', log=error)
 
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': ' inline '})
+    def test_logger_logs_error_inline_with_messy_env(self):
+        logger.log(level='INFO', log={'message': 'inline-format'})
+
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': 'JSON'})
+    def test_logger_json_output(self):
+        buffer = io.StringIO()
+        with redirect_stdout(buffer):
+            logger.log(level='WARN', log={'json': True})
+        log_output = buffer.getvalue().strip()
+        parsed = json.loads(log_output)
+        self.assertEqual('WARN', parsed['level'])
+        self.assertEqual({'json': True}, parsed['log'])
+
+    @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_FORMAT': 'INLINE'})
+    def test_logger_inline_output(self):
+        buffer = io.StringIO()
+        with redirect_stdout(buffer):
+            logger.log(level='INFO', log={'inline': True})
+        log_output = buffer.getvalue().strip()
+        self.assertTrue(log_output.startswith('INFO|'))
+        self.assertIn("inline': True", log_output)
+
     @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local'})
     def test_logger_logs_error_as_object(self):
         try:
@@ -96,4 +122,3 @@ class LoggerTest(TestCase):
     @mock.patch.dict(os.environ, {'RUN_MODE': 'SEE-LOGS', 'LOG_STAGE_VARIABLE': 'STAGE', 'STAGE': 'local', 'LOG_LEVEL': 'ERROR', 'LOG_FORMAT': 'BAD'})
     def test_logger_handles_bad_format(self):
         logger.log(level='INFO', log={'INFO': 'ignore'})
-