acai-aws 2.2.7__py3-none-any.whl → 2.2.9__py3-none-any.whl

acai_aws/apigateway/resolver/modes/directory.py

@@ -4,11 +4,15 @@ from acai_aws.apigateway.exception import ApiException
 
 class DirectoryModeResolver(BaseModeResolver):
 
+    INIT_FILE = '__init__.py'
+
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.__handler_path = self.importer.clean_path(kwargs['handlers'])
 
     def _get_file_and_import_path(self, request_path):
+        # ensure previous lookups don't leave behind path/dynamic state
+        self.reset()
         split_path = self.get_request_path_as_list(request_path)
         route_path = self.__get_route_path(split_path)
         file_path = self.__handler_path + self.importer.file_separator + route_path
@@ -25,7 +29,7 @@ class DirectoryModeResolver(BaseModeResolver):
             part = split_path[split_index]
             if part == '':
                 possible_directory = None
-                possible_file = '__init__.py'
+                possible_file = self.INIT_FILE
             else:
                 possible_directory = part.replace('-', '_')
                 possible_file = f'{possible_directory}.py'
@@ -44,7 +48,7 @@ class DirectoryModeResolver(BaseModeResolver):
             file_leaf = self.determine_which_file_leaf(file_tree, possible_directory)
             self.__get_import_path_file_tree(split_path, split_index+1, file_leaf)
         else:
-            self.append_import_path('__init__.py')
+            self.append_import_path(self.INIT_FILE)
 
     def __handle_file_path_part(self, possible_file, split_path, split_index, file_tree):
         self.append_import_path(possible_file)
@@ -55,7 +59,7 @@ class DirectoryModeResolver(BaseModeResolver):
         file_part = list(file_tree['__dynamic_files'])[0]
         self.append_import_path(file_part)
         if '.py' not in file_part and split_index+1 == len(split_path):
-            self.append_import_path('__init__.py')
+            self.append_import_path(self.INIT_FILE)
         file_leaf = self.determine_which_file_leaf(file_tree, file_part)
         self.has_dynamic_route = True
         self.dynamic_parts[split_index] = split_path[split_index]

acai_aws/common/logger/common_logger.py

@@ -10,7 +10,8 @@ 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')

{acai_aws-2.2.7.dist-info → acai_aws-2.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acai_aws
-Version: 2.2.7
+Version: 2.2.9
 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.7.dist-info → acai_aws-2.2.9.dist-info}/RECORD

@@ -13,7 +13,7 @@ acai_aws/apigateway/resolver/cache.py,sha256=myABSHkAx7ZEsW8_NWCGccnICJ9PXmY43GH
 acai_aws/apigateway/resolver/importer.py,sha256=h4EKqECW35UfDXJjKxD2ClLvDN8lXl0oiWSqsWAgqAU,3757
 acai_aws/apigateway/resolver/modes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 acai_aws/apigateway/resolver/modes/base.py,sha256=ZXhRHKsfltuZZAfoRyJ8fZXnliGHQxncB5kryuWnLNY,1760
-acai_aws/apigateway/resolver/modes/directory.py,sha256=zr2U0_LD7ImBa0dOnHcwJyt19wwVDreoCwx7-3nwi60,3167
+acai_aws/apigateway/resolver/modes/directory.py,sha256=2r0HK020ingbtLnjKm955WTNVJp9j6rbTnIVQegLPv4,3294
 acai_aws/apigateway/resolver/modes/mapping.py,sha256=B699anOGoX2XfwYAjIaYQ8FM83eSi0z0lYHTO_bdIsM,3099
 acai_aws/apigateway/resolver/modes/pattern.py,sha256=SWb8713ohEI216RKK6lvAUuleiW161293GUCrr7gSVk,2701
 acai_aws/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=WxhSvsC2a2DZYuWatpdOPraromrIUItZw1boP10kw5U,2035
 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.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+acai_aws-2.2.9.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
@@ -97,7 +97,7 @@ tests/acai_aws/apigateway/resolver/test_cacher.py,sha256=NSPMdy9IIapEz6BSOppKpKD
 tests/acai_aws/apigateway/resolver/test_importer.py,sha256=9gb8cv8gPeWap5eIb8S5zp6fl1ZebKRCriAueR0f1A0,4685
 tests/acai_aws/apigateway/resolver/test_init.py,sha256=6c0ok7924i2EaynfLOx_7W-h-RgNAKiur63-NZQ3JUk,3277
 tests/acai_aws/apigateway/resolver/modes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/acai_aws/apigateway/resolver/modes/test_directory.py,sha256=ghsHW7cD-Tniw438GXUbF6xey5Ntr3QuZUmWQVj5eDs,7069
+tests/acai_aws/apigateway/resolver/modes/test_directory.py,sha256=o2LIFI-bYP0qGF5Q5Dfzc_EG1pkHn4VHgWGEk_v8eqs,7525
 tests/acai_aws/apigateway/resolver/modes/test_mapping.py,sha256=j_nMWfO6KqRSt2sGkVNIQQKOzNNvXvp-hfNPX-ESnOc,6532
 tests/acai_aws/apigateway/resolver/modes/test_pattern.py,sha256=CEqPVlCNniVU5N9y4WKYhEqI_gLwpswbRdBZYPZmd2E,6020
 tests/acai_aws/apigateway/router/__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.7.dist-info/METADATA,sha256=JMEq-FrEyr-K-n_IrO4Pt1ufyGGATNDt06jeWsTbtos,15175
-acai_aws-2.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-acai_aws-2.2.7.dist-info/top_level.txt,sha256=A6vdhfU7MqNqO9rGdH1Z2EEqpnbIIyb4PsHJbRktbbI,15
-acai_aws-2.2.7.dist-info/RECORD,,
+acai_aws-2.2.9.dist-info/METADATA,sha256=ImieSh-sZSiYEMoNPsc46pDgm85xGuMaGftqgd62OqU,15175
+acai_aws-2.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+acai_aws-2.2.9.dist-info/top_level.txt,sha256=A6vdhfU7MqNqO9rGdH1Z2EEqpnbIIyb4PsHJbRktbbI,15
+acai_aws-2.2.9.dist-info/RECORD,,

tests/acai_aws/apigateway/resolver/modes/test_directory.py

@@ -121,3 +121,10 @@ class DirectoryModeResolverTest(unittest.TestCase):
         file_path, import_path = self.directory_resolver._get_file_and_import_path(request.path)
         self.assertTrue('tests/mocks/apigateway/resolver/directory_handlers/user/_user_id/item/_item_id.py' in file_path)
         self.assertEqual('tests.mocks.apigateway.resolver.directory_handlers.user._user_id.item._item_id', import_path)
+
+    def test_repeated_directory_request_resets_import_path(self):
+        request = Request(self.init_request)
+        first_file_path, first_import_path = self.directory_resolver._get_file_and_import_path(request.path)
+        second_file_path, second_import_path = self.directory_resolver._get_file_and_import_path(request.path)
+        self.assertEqual(first_file_path, second_file_path)
+        self.assertEqual(first_import_path, second_import_path)

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'})
-