improv: adjust high level imports

Author: heitorlessa

aws_lambda_powertools/utilities/parser/__init__.py

@@ -1,6 +1,9 @@
 """Advanced parser utility
 """
 from . import envelopes
+from .envelopes import BaseEnvelope
+from .exceptions import SchemaValidationError
 from .parser import parser
+from .pydantic import BaseModel, root_validator, validator
 
-__all__ = ["envelopes", "parser"]
+__all__ = ["parser", "envelopes", "BaseEnvelope", "BaseModel", "validator", "root_validator", "SchemaValidationError"]

aws_lambda_powertools/utilities/parser/envelopes/__init__.py

@@ -1,7 +1,6 @@
+from .base import BaseEnvelope
 from .dynamodb import DynamoDBEnvelope
 from .event_bridge import EventBridgeEnvelope
 from .sqs import SqsEnvelope
 
-SQS = SqsEnvelope
-DYNAMODB_STREAM = DynamoDBEnvelope
-EVENTBRIDGE = EventBridgeEnvelope
+__all__ = ["DynamoDBEnvelope", "EventBridgeEnvelope", "SqsEnvelope", "BaseEnvelope"]

aws_lambda_powertools/utilities/parser/envelopes/event_bridge.py

@@ -3,8 +3,8 @@
 
 from pydantic import BaseModel
 
-from aws_lambda_powertools.utilities.parser.envelopes.base import BaseEnvelope
-from aws_lambda_powertools.utilities.parser.schemas import EventBridgeSchema
+from ..schemas import EventBridgeSchema
+from .base import BaseEnvelope
 
 logger = logging.getLogger(__name__)
 

aws_lambda_powertools/utilities/parser/parser.py

@@ -3,8 +3,7 @@
 
 from pydantic import BaseModel, ValidationError
 
-from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
-
+from ...middleware_factory import lambda_handler_decorator
 from ..typing import LambdaContext
 from .envelopes.base import BaseEnvelope
 from .exceptions import InvalidEnvelopeError, InvalidSchemaTypeError, SchemaValidationError

tests/functional/parser/conftest.py

@@ -3,8 +3,7 @@
 import pytest
 from pydantic import BaseModel, ValidationError
 
-from aws_lambda_powertools.utilities.parser.envelopes.base import BaseEnvelope
-from aws_lambda_powertools.utilities.parser.exceptions import SchemaValidationError
+from aws_lambda_powertools.utilities.parser import BaseEnvelope, SchemaValidationError
 
 
 @pytest.fixture

tests/functional/parser/test_dynamodb.py

@@ -8,7 +8,7 @@
 from tests.functional.parser.utils import load_event
 
 
-@parser(schema=MyDynamoBusiness, envelope=envelopes.DYNAMODB_STREAM)
+@parser(schema=MyDynamoBusiness, envelope=envelopes.DynamoDBEnvelope)
 def handle_dynamodb(event: List[Dict[str, MyDynamoBusiness]], _: LambdaContext):
     assert len(event) == 2
     assert event[0]["OldImage"] is None

tests/functional/parser/test_eventbridge.py

@@ -8,7 +8,7 @@
 from tests.functional.parser.utils import load_event
 
 
-@parser(schema=MyEventbridgeBusiness, envelope=envelopes.EVENTBRIDGE)
+@parser(schema=MyEventbridgeBusiness, envelope=envelopes.EventBridgeEnvelope)
 def handle_eventbridge(event: MyEventbridgeBusiness, _: LambdaContext):
     assert event.instance_id == "i-1234567890abcdef0"
     assert event.state == "terminated"

tests/functional/parser/test_sqs.py

@@ -9,7 +9,7 @@
 from tests.functional.validator.conftest import sqs_event  # noqa: F401
 
 
-@parser(schema=MySqsBusiness, envelope=envelopes.SQS)
+@parser(schema=MySqsBusiness, envelope=envelopes.SqsEnvelope)
 def handle_sqs_json_body(event: List[MySqsBusiness], _: LambdaContext):
     assert len(event) == 1
     assert event[0].message == "hello world"