fix: addressing comments

Author: rubenfonseca

aws_lambda_powertools/event_handler/api_gateway.py

@@ -26,8 +26,6 @@
     cast,
 )
 
-from typing_extensions import Literal
-
 from aws_lambda_powertools.event_handler import content_types
 from aws_lambda_powertools.event_handler.exceptions import NotFoundError, ServiceError
 from aws_lambda_powertools.event_handler.openapi.types import (
@@ -39,6 +37,7 @@
 from aws_lambda_powertools.shared.cookies import Cookie
 from aws_lambda_powertools.shared.functions import powertools_dev_is_set
 from aws_lambda_powertools.shared.json_encoder import Encoder
+from aws_lambda_powertools.shared.types import Literal
 from aws_lambda_powertools.utilities.data_classes import (
     ALBEvent,
     APIGatewayProxyEvent,

aws_lambda_powertools/event_handler/openapi/models.py

@@ -2,10 +2,10 @@
 from typing import Any, Dict, List, Optional, Set, Union
 
 from pydantic import AnyUrl, BaseModel, Field
-from typing_extensions import Annotated, Literal
 
 from aws_lambda_powertools.event_handler.openapi.compat import model_rebuild
 from aws_lambda_powertools.event_handler.openapi.types import PYDANTIC_V2
+from aws_lambda_powertools.shared.types import Annotated, Literal
 
 """
 The code defines Pydantic models for the various OpenAPI objects like OpenAPI, PathItem, Operation, Parameter etc.

aws_lambda_powertools/event_handler/openapi/params.py

@@ -4,7 +4,6 @@
 
 from pydantic import BaseConfig
 from pydantic.fields import FieldInfo
-from typing_extensions import Annotated, Literal, get_args, get_origin
 
 from aws_lambda_powertools.event_handler.openapi.compat import (
     ModelField,
@@ -16,6 +15,7 @@
     get_annotation_from_field_info,
 )
 from aws_lambda_powertools.event_handler.openapi.types import PYDANTIC_V2, CacheKey
+from aws_lambda_powertools.shared.types import Annotated, Literal, get_args, get_origin
 
 """
 This turns the low-level function signature into typed, validated Pydantic models for consumption.

aws_lambda_powertools/shared/types.py

@@ -2,24 +2,30 @@
 from typing import Any, Callable, Dict, List, TypeVar, Union
 
 if sys.version_info >= (3, 8):
-    from typing import Literal, Protocol, TypedDict
+    from typing import Literal, Protocol, TypedDict, get_args
 else:
-    from typing_extensions import Literal, Protocol, TypedDict
+    from typing_extensions import Literal, Protocol, TypedDict, get_args
 
+if sys.version_info >= (3, 9):
+    from typing import Annotated
+else:
+    from typing_extensions import Annotated
 
 if sys.version_info >= (3, 11):
     from typing import NotRequired
 else:
     from typing_extensions import NotRequired
 
 
+# Even though `get_origin` was added in Python 3.8, it only handles Annotated correctly on 3.10.
+# So for python < 3.10 we use the backport from typing_extensions.
 if sys.version_info >= (3, 10):
-    from typing import TypeAlias
+    from typing import TypeAlias, get_origin
 else:
-    from typing_extensions import TypeAlias
+    from typing_extensions import TypeAlias, get_origin
 
 AnyCallableT = TypeVar("AnyCallableT", bound=Callable[..., Any])  # noqa: VNE001
 # JSON primitives only, mypy doesn't support recursive tho
 JSONType = Union[str, int, float, bool, None, Dict[str, Any], List[Any]]
 
-__all__ = ["Protocol", "TypedDict", "Literal", "NotRequired", "TypeAlias"]
+__all__ = ["get_args", "get_origin", "Annotated", "Protocol", "TypedDict", "Literal", "NotRequired", "TypeAlias"]

tests/functional/event_handler/test_openapi_params.py

@@ -3,7 +3,6 @@
 from typing import List
 
 from pydantic import BaseModel
-from typing_extensions import Annotated
 
 from aws_lambda_powertools.event_handler.api_gateway import APIGatewayRestResolver
 from aws_lambda_powertools.event_handler.openapi.models import (
@@ -13,6 +12,7 @@
     Schema,
 )
 from aws_lambda_powertools.event_handler.openapi.params import Body, Query
+from aws_lambda_powertools.shared.types import Annotated
 
 JSON_CONTENT_TYPE = "application/json"
 

tests/functional/event_handler/test_openapi_validation_middleware.py

@@ -1,10 +1,10 @@
 import json
 
 from pydantic import BaseModel
-from typing_extensions import Annotated
 
 from aws_lambda_powertools.event_handler import APIGatewayRestResolver
 from aws_lambda_powertools.event_handler.openapi.params import Body
+from aws_lambda_powertools.shared.types import Annotated
 from tests.functional.utils import load_event
 
 LOAD_GW_EVENT = load_event("apiGatewayProxyEvent.json")