fix tests

Author: sthulb

aws_lambda_powertools/utilities/parser/parser.py

@@ -2,7 +2,7 @@
 import typing
 from typing import Any, Callable, Dict, Optional, Type, overload
 
-from pydantic import TypeAdapter
+from pydantic import TypeAdapter, ValidationError
 
 from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
 from aws_lambda_powertools.utilities.parser.envelopes.base import Envelope
@@ -95,13 +95,16 @@ def handler(event: Order, context: LambdaContext):
                 "or as the type hint of `event` in the handler that it wraps",
             )
 
-    if envelope:
-        parsed_event = parse(event=event, model=model, envelope=envelope)
-    else:
-        parsed_event = parse(event=event, model=model)
+    try:
+        if envelope:
+            parsed_event = parse(event=event, model=model, envelope=envelope)
+        else:
+            parsed_event = parse(event=event, model=model)
 
-    logger.debug(f"Calling handler {handler.__name__}")
-    return handler(parsed_event, context, **kwargs)
+        logger.debug(f"Calling handler {handler.__name__}")
+        return handler(parsed_event, context, **kwargs)
+    except (ValidationError, AttributeError) as exc:
+        raise InvalidModelTypeError(f"Error: {str(exc)}. Please ensure the type you're trying to parse into is correct")
 
 
 @overload
@@ -186,7 +189,7 @@ def handler(event: Order, context: LambdaContext):
 
         return adapter.validate_python(event)
 
-    except AttributeError as exc:
+    except Exception as exc:
         raise InvalidModelTypeError(
             f"Error: {str(exc)}. Please ensure the Input model inherits from BaseModel,\n"
             "and your payload adheres to the specified Input model structure.\n"

tests/functional/parser/test_parser.py

@@ -5,7 +5,6 @@
 import pytest
 
 from aws_lambda_powertools.utilities.parser import (
-    ValidationError,
     event_parser,
     exceptions,
 )
@@ -18,7 +17,7 @@ def test_parser_unsupported_event(dummy_schema, invalid_value):
     def handle_no_envelope(event: Dict, _: LambdaContext):
         return event
 
-    with pytest.raises(ValidationError):
+    with pytest.raises(exceptions.InvalidModelTypeError):
         handle_no_envelope(event=invalid_value, context=LambdaContext())