modmex-lambda 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

modmex_lambda/__init__.py

@@ -13,7 +13,12 @@ if TYPE_CHECKING:
     )
     from .event_handler.request import Request
     from .event_sources import event_source
-    from .event_handler.dependencies.depends import Depends
+    from .event_handler.dependencies.depends import (
+        DefaultDependencyResolver,
+        DependencyResolver,
+        Depends,
+        InjectorDependencyResolver,
+    )
     from .logging import Logger
     from .parser import event_parser, parse
     from .validation import ModmexValidator, ValidationError
@@ -26,7 +31,10 @@ _EXPORTS = {
     "parse": ("modmex_lambda.parser", "parse"),
     "event_parser": ("modmex_lambda.parser", "event_parser"),
     "event_source": ("modmex_lambda.event_sources", "event_source"),
+    "DefaultDependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "DefaultDependencyResolver"),
+    "DependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "DependencyResolver"),
     "Depends": ("modmex_lambda.event_handler.dependencies.depends", "Depends"),
+    "InjectorDependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "InjectorDependencyResolver"),
     "Logger": ("modmex_lambda.logging", "Logger"),
     "ModmexValidator": ("modmex_lambda.validation", "ModmexValidator"),
     "ValidationError": ("modmex_lambda.validation", "ValidationError"),
@@ -40,7 +48,10 @@ __all__ = [
     "parse",
     "event_parser",
     "event_source",
+    "DefaultDependencyResolver",
+    "DependencyResolver",
     "Depends",
+    "InjectorDependencyResolver",
     "Logger",
     "ModmexValidator",
     "ValidationError",

modmex_lambda/event_handler/__init__.py

@@ -10,13 +10,16 @@ if TYPE_CHECKING:
         ApiGatewayRestResolver,
         Response,
     )
-    from .dependencies.depends import Depends
+    from .dependencies.depends import DefaultDependencyResolver, DependencyResolver, Depends, InjectorDependencyResolver
 
 _EXPORTS = {
     "ApiGatewayHttpResolver": ("modmex_lambda.event_handler.api_gateway", "ApiGatewayHttpResolver"),
     "ApiGatewayRestResolver": ("modmex_lambda.event_handler.api_gateway", "ApiGatewayRestResolver"),
     "Response": ("modmex_lambda.event_handler.api_gateway", "Response"),
+    "DefaultDependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "DefaultDependencyResolver"),
+    "DependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "DependencyResolver"),
     "Depends": ("modmex_lambda.event_handler.dependencies.depends", "Depends"),
+    "InjectorDependencyResolver": ("modmex_lambda.event_handler.dependencies.depends", "InjectorDependencyResolver"),
     "content_types": ("modmex_lambda.event_handler.content_types", None),
 }
 
@@ -24,7 +27,10 @@ __all__ = [
     "ApiGatewayHttpResolver",
     "ApiGatewayRestResolver",
     "Response",
+    "DefaultDependencyResolver",
+    "DependencyResolver",
     "Depends",
+    "InjectorDependencyResolver",
     "content_types",
 ]
 

modmex_lambda/event_handler/api_gateway.py

@@ -27,6 +27,7 @@ from modmex_lambda.data_classes.api_gateway_proxy_event import APIGatewayProxyEv
 from modmex_lambda.shared.types import AnyCallableT
 from modmex_lambda.event_handler.types import IApiGatewayResolver
 from modmex_lambda.event_handler.dependencies.dependency_middleware import DependencyMiddleware
+from modmex_lambda.event_handler.dependencies.depends import DefaultDependencyResolver, DependencyResolver
 from modmex_lambda.event_handler.middlewares import NextMiddleware
 from modmex_lambda.event_handler.cors import CORSConfig
 from modmex_lambda.shared.json_encoder import JSONEncoder
@@ -104,6 +105,7 @@ class ApiGatewayResolver(BaseRouter, IApiGatewayResolver):
         strip_prefixes: list[str | Pattern] | None = None,
         json_body_deserializer: Callable[[str], dict] | None = None,
         logger: Any | None = None,
+        dependency_resolver: DependencyResolver | None = None,
     ) -> None:
         self._cors = cors
         self._cors_enabled = cors is not None
@@ -118,6 +120,7 @@ class ApiGatewayResolver(BaseRouter, IApiGatewayResolver):
         self._router_middlewares: list[Middleware] = []
 
         self._logger = logger
+        self.dependency_resolver = dependency_resolver or DefaultDependencyResolver()
         self.dependency_overrides: dict[Callable[..., Any], Callable[..., Any]] = {}
         self.current_event = None
         self.current_context = None

modmex_lambda/event_handler/dependencies/__init__.py

@@ -0,0 +1,13 @@
+from modmex_lambda.event_handler.dependencies.depends import (
+    DefaultDependencyResolver,
+    DependencyResolver,
+    Depends,
+    InjectorDependencyResolver,
+)
+
+__all__ = [
+    "DefaultDependencyResolver",
+    "DependencyResolver",
+    "Depends",
+    "InjectorDependencyResolver",
+]

modmex_lambda/event_handler/dependencies/dependant.py

@@ -131,12 +131,15 @@ def get_dependant(
 
         depends = _get_depends_from_annotation(param.annotation)
         if depends is not None:
+            depends = depends.resolve_for_annotation(param.annotation)
             _inherit_local_namespace(parent=call, dependency=depends.dependency)
             dependant.dependencies.append(
                 DependencyParam(
                     param_name=param_name,
                     depends=depends,
-                    dependant=get_dependant(path=path, call=depends.dependency),
+                    dependant=Dependant(call=depends.dependency)
+                    if inspect.isclass(depends.dependency)
+                    else get_dependant(path=path, call=depends.dependency),
                 ),
             )
             continue

modmex_lambda/event_handler/dependencies/depends.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Annotated, Any, Callable, get_args, get_origin, get_type_hints
+import inspect
+from typing import Annotated, Any, Callable, Protocol, get_args, get_origin, get_type_hints
 
 from modmex_lambda.event_handler.dependencies.compat import ModelField
 from modmex_lambda.event_handler.dependencies.types import CacheKey
@@ -43,15 +44,83 @@ class DependencyResolutionError(Exception):
     """Raised when a dependency cannot be resolved."""
 
 
+class DependencyResolver(Protocol):
+    """Resolves a dependency token into the value passed to a route handler."""
+
+    def resolve(
+        self,
+        dependency: Callable[..., Any] | type[Any],
+        *,
+        values: dict[str, Any] | None = None,
+        request: Request | None = None,
+    ) -> Any:
+        ...
+
+
+class DefaultDependencyResolver:
+    """Default resolver that calls dependency functions with solved values."""
+
+    def resolve(
+        self,
+        dependency: Callable[..., Any] | type[Any],
+        *,
+        values: dict[str, Any] | None = None,
+        request: Request | None = None,
+    ) -> Any:
+        return dependency(**(values or {}))
+
+
+class InjectorDependencyResolver:
+    """Optional adapter for the ``injector`` package."""
+
+    def __init__(self, injector: Any) -> None:
+        self.injector = injector
+
+    def resolve(
+        self,
+        dependency: Callable[..., Any] | type[Any],
+        *,
+        values: dict[str, Any] | None = None,
+        request: Request | None = None,
+    ) -> Any:
+        kwargs = values or {}
+
+        if hasattr(self.injector, "call_with_injection") and not inspect.isclass(dependency):
+            return self.injector.call_with_injection(dependency, kwargs=kwargs)
+
+        if not kwargs and inspect.isclass(dependency) and hasattr(self.injector, "get"):
+            return self.injector.get(dependency)
+
+        return dependency(**kwargs)
+
+
 class Depends:
-    def __init__(self, dependency: Callable[..., Any], *, use_cache: bool = True) -> None:
-        if not callable(dependency):
+    def __init__(
+        self,
+        dependency: Callable[..., Any] | type[Any] | None = None,
+        *,
+        use_cache: bool = True,
+    ) -> None:
+        if dependency is not None and not callable(dependency):
             raise DependencyResolutionError(
                 f"Depends() requires a callable, got {type(dependency).__name__}: {dependency!r}",
             )
         self.dependency = dependency
         self.use_cache = use_cache
 
+    def resolve_for_annotation(self, annotation: Any) -> Depends:
+        if self.dependency is not None:
+            return self
+
+        if get_origin(annotation) is Annotated:
+            dependency = get_args(annotation)[0]
+            if callable(dependency):
+                return Depends(dependency, use_cache=self.use_cache)
+
+        raise DependencyResolutionError(
+            "Depends() without a callable requires a callable parameter annotation",
+        )
+
 
 class _DependencyNode:
     """Lightweight node in a dependency tree."""
@@ -101,12 +170,17 @@ def build_dependency_tree(func: Callable[..., Any]) -> DependencyTree:
         depends = _get_depends_from_annotation(annotation)
         if depends is None:
             continue
+        depends = depends.resolve_for_annotation(annotation)
 
         dependencies.append(
             _DependencyNode(
                 param_name=param_name,
                 depends=depends,
-                sub_tree=build_dependency_tree(depends.dependency),
+                sub_tree=(
+                    DependencyTree()
+                    if inspect.isclass(depends.dependency)
+                    else build_dependency_tree(depends.dependency)
+                ),
             ),
         )
 
@@ -119,12 +193,14 @@ def solve_dependencies(
     request: Request | None = None,
     dependency_overrides: dict[Callable[..., Any], Callable[..., Any]] | None = None,
     dependency_cache: dict[Callable[..., Any], Any] | None = None,
+    dependency_resolver: DependencyResolver | None = None,
 ) -> dict[str, Any]:
     """Resolve all Depends parameters for a route or lightweight dependency tree."""
     from modmex_lambda.event_handler.request import Request as RequestClass
 
     cache = dependency_cache if dependency_cache is not None else {}
     overrides = dependency_overrides or {}
+    resolver = dependency_resolver or DefaultDependencyResolver()
     values: dict[str, Any] = {}
 
     for dep in dependant.dependencies:
@@ -139,11 +215,12 @@ def solve_dependencies(
             request=request,
             dependency_overrides=overrides,
             dependency_cache=cache,
+            dependency_resolver=resolver,
         )
         sub_values.update(_request_injection_values(dependency, request, RequestClass))
 
         try:
-            solved = dependency(**sub_values)
+            solved = resolver.resolve(dependency, values=sub_values, request=request)
         except Exception as exc:
             dep_name = getattr(dependency, "__name__", repr(dependency))
             raise DependencyResolutionError(
@@ -177,7 +254,10 @@ def _request_injection_values(
 __all__ = [
     "Dependant",
     "DependencyParam",
+    "DependencyResolver",
+    "DefaultDependencyResolver",
     "Depends",
+    "InjectorDependencyResolver",
     "_get_depends_from_annotation",
     "build_dependency_tree",
     "solve_dependencies",

modmex_lambda/event_handler/routing.py

@@ -492,6 +492,7 @@ class RouteEndpointInvoker:
                         dependant=route.dependant,
                         request=app.request,
                         dependency_overrides=app.dependency_overrides or None,
+                        dependency_resolver=app.dependency_resolver,
                     ),
                 )
 

modmex_lambda/event_handler/types.py

@@ -4,6 +4,7 @@ from typing import Any, Callable, TypeVar, Union
 
 from abc import ABC
 from modmex_lambda.data_classes.api_gateway_proxy_event import APIGatewayProxyEvent, APIGatewayProxyEventV2
+from modmex_lambda.event_handler.dependencies.depends import DependencyResolver
 from modmex_lambda.event_handler.request import Request
 from modmex_lambda.event_handler.response import Response
 
@@ -11,6 +12,7 @@ from modmex_lambda.event_handler.response import Response
 class IApiGatewayResolver(ABC):
     context: dict[str, Any]
     current_event: Union[APIGatewayProxyEvent, APIGatewayProxyEventV2]
+    dependency_resolver: DependencyResolver
     dependency_overrides: dict[Callable[..., Any], Callable[..., Any]]
     _dependency_middleware: Callable[..., Any]
 

{modmex_lambda-0.1.0.dist-info → modmex_lambda-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modmex-lambda
-Version: 0.1.0
+Version: 0.2.0
 Summary: Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling.
 Author: Modmex
 License: MIT
@@ -9,6 +9,8 @@ Requires-Python: >=3.10
 Requires-Dist: modmex<2.0.0,>=1.1.10
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == 'dev'
+Provides-Extra: injector
+Requires-Dist: injector<1.0.0,>=0.24.0; extra == 'injector'
 Description-Content-Type: text/markdown
 
 # modmex-lambda
@@ -26,11 +28,17 @@ logging with a small dependency footprint.
 pip install modmex-lambda
 ```
 
-For local development:
+
+To use the optional `injector` integration:
+
+```bash
+pip install "modmex-lambda[injector]"
+```
+
+With Poetry:
 
 ```bash
-poetry install --extras dev
-poetry run pytest -q
+poetry add "modmex-lambda[injector]"
 ```
 
 ## API Gateway Resolvers
@@ -236,6 +244,69 @@ def get_user(
     return repository.get_user(user_id)
 ```
 
+For constructor-heavy services, install the optional `injector` extra and pass
+an `InjectorDependencyResolver` to the app. `Depends()` without a callable uses
+the parameter annotation as the dependency token.
+
+```python
+from typing import Annotated
+
+from injector import Injector, Module, inject, provider, singleton
+from modmex_lambda import ApiGatewayHttpResolver, Depends, InjectorDependencyResolver
+from modmex_lambda.event_handler.params import Path
+
+
+class Settings:
+    def __init__(self, tenant_id: str):
+        self.tenant_id = tenant_id
+
+
+class UserRepository:
+    def __init__(self, settings: Settings):
+        self.settings = settings
+
+    def get_user(self, user_id: int) -> dict:
+        return {"id": user_id, "tenant_id": self.settings.tenant_id}
+
+
+class UserService:
+    def __init__(self, repository: UserRepository):
+        self.repository = repository
+
+    def get_user(self, user_id: int) -> dict:
+        return self.repository.get_user(user_id)
+
+
+class AppModule(Module):
+    @singleton
+    @provider
+    def provide_settings(self) -> Settings:
+        return Settings(tenant_id="mx")
+
+    @singleton
+    @provider
+    @inject
+    def provide_repository(self, settings: Settings) -> UserRepository:
+        return UserRepository(settings)
+
+    @singleton
+    @provider
+    @inject
+    def provide_service(self, repository: UserRepository) -> UserService:
+        return UserService(repository)
+
+
+container = Injector([AppModule()])
+app = ApiGatewayHttpResolver(dependency_resolver=InjectorDependencyResolver(container))
+
+@app.get("/users/<user_id>")
+def get_user(
+    user_id: Annotated[int, Path()],
+    service: Annotated[UserService, Depends()],
+):
+    return service.get_user(user_id)
+```
+
 Disable dependency caching when a dependency must run every time:
 
 ```python

{modmex_lambda-0.1.0.dist-info → modmex_lambda-0.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-modmex_lambda/__init__.py,sha256=3gWLZwuPGrvvjTsycbsvGd4Noh4bEj87MwP32IyNrjU,1966
+modmex_lambda/__init__.py,sha256=qgc6KWY3oA15AsKqC1DkSKrwsXd4l2I8rlLOcIglJn8,2511
 modmex_lambda/event_sources.py,sha256=eLTEN1g9JF2Nk09fMcJn43dBz8BKwCOrtxmZkzr99sM,1714
 modmex_lambda/exceptions.py,sha256=GL6ZZKhXr0BqfCsGwzookBrUJ1M7JIU2Ju3vWdyna_s,128
 modmex_lambda/logging.py,sha256=FFINAvMu25d0Ieow-Wa8fEjr9xvtRtPgtLixsDGFPHc,3335
@@ -15,8 +15,8 @@ modmex_lambda/data_classes/api_gateway_proxy_event.py,sha256=fetGgKG4QFpPXu0lImt
 modmex_lambda/data_classes/api_gateway_websocket_event.py,sha256=EGFqQ4SrC-ssb509UzfNLWpPm7gdtleoYz5Pvb2fIwU,1031
 modmex_lambda/data_classes/cognito_user_pool_event.py,sha256=DwHa9xtqpFYnFKdUi1Y9RRgxvkVGJQXhFkRh7_4iAf4,18582
 modmex_lambda/data_classes/common.py,sha256=8saOnaCxH25G-jQumUJMg6CuOhuJ6ugw4vAWH-Fn4Ls,13656
-modmex_lambda/event_handler/__init__.py,sha256=4uB7HhYgShpgXJECQhvxJId8Y1Cbkz69M0rpuSxN0I8,1327
-modmex_lambda/event_handler/api_gateway.py,sha256=YdgeyObhdPsBApQxnSQd-JykqJ6WKsrIqgKw5r9X8d0,11795
+modmex_lambda/event_handler/__init__.py,sha256=yIiz_l7FFZOARIZ2oFCL4ESIFt078zxv-GslZjx78Go,1831
+modmex_lambda/event_handler/api_gateway.py,sha256=Yeucrol7ovZ6uaytRN7QhLxOOs_O-9EtgEjuw1dJ0Rs,12051
 modmex_lambda/event_handler/constants.py,sha256=x53p_BZw2lmISpkO5v6d1nfuP-De9uUsUtwgJLaBHKw,28
 modmex_lambda/event_handler/content_types.py,sha256=FcnCaAVhEOewQXAbkStMBNC63NFMxqwmEFnXcGholug,282
 modmex_lambda/event_handler/cors.py,sha256=j8H81NdPxqRl5ikW8Wdf7o6pEIx7dGkAsCtSysYI1nc,3516
@@ -27,14 +27,14 @@ modmex_lambda/event_handler/middlewares.py,sha256=oOsQ0nOl7lc_N-kt8wTx7qOXNE5VtR
 modmex_lambda/event_handler/params.py,sha256=nNhLKduyeQ6TI9Zli32_XtRM93e973igOOZSY0vcpy4,544
 modmex_lambda/event_handler/request.py,sha256=f5TMv6muYfYOsLbZMPdd6kRMza8U2-UiyNmvuB5grH4,1705
 modmex_lambda/event_handler/response.py,sha256=izW9v_0E91UsQKX6-W26wnuAy-YP2_kTPbA5OW9L3tM,1988
-modmex_lambda/event_handler/routing.py,sha256=ofRSEfWxxAayThjgsBzZ6ZQaSFwtFxnpp1LDp-za2vY,16077
+modmex_lambda/event_handler/routing.py,sha256=MqwHvf9d4qu_1U-qxx85q5m22BQ3kAzfhPeJeMUyaTs,16146
 modmex_lambda/event_handler/routing_fallbacks.py,sha256=vx23xyg4vEKCqGg1bxBP0OxRsN8NbMkAdehfcNiqwjw,3669
-modmex_lambda/event_handler/types.py,sha256=VKl50yStngGK1vBsPVDLQnO8zffgqL9T1StPIVY82qo,1060
-modmex_lambda/event_handler/dependencies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modmex_lambda/event_handler/types.py,sha256=VRYaZVipqvwT_PyJ5teGADPIDyt_xRpqJ4bmqhd-lIA,1184
+modmex_lambda/event_handler/dependencies/__init__.py,sha256=KqYkgjAYNlZ2_PIDWAQSG4syIgeTdVmDQC5_lVjfyKI,288
 modmex_lambda/event_handler/dependencies/compat.py,sha256=MPEJ9EKNja_ys4XLGIm8vTgN7Z96nmuqYHTvixHFR9A,7599
-modmex_lambda/event_handler/dependencies/dependant.py,sha256=LWo2r6BZkOKo26tXr5g9vJ_C9Yrixf6iiFsAfM66JXw,9306
+modmex_lambda/event_handler/dependencies/dependant.py,sha256=0Y_-AemuI3DRMgtI9RDdHBFRRIfALulq9Ouqd0Ha8Nk,9496
 modmex_lambda/event_handler/dependencies/dependency_middleware.py,sha256=c_N7UgtbAVYC6xbfn_MaW7zYQxi5pSSdTeIRaz703Ak,14999
-modmex_lambda/event_handler/dependencies/depends.py,sha256=X174dJZ_m6kYvcUvy2IJ7UuLRDV8lH2Jgiht5PQRt8w,5932
+modmex_lambda/event_handler/dependencies/depends.py,sha256=t9FlQpbNc4d7N4YqpeKNwAuyWwfNkwb0TX8o2OTNbXo,8451
 modmex_lambda/event_handler/dependencies/params.py,sha256=bc208GHiXCfm1V-GLeIMm8-ypZ8P8Q9qUKQkK2Vh1Fg,10085
 modmex_lambda/event_handler/dependencies/types.py,sha256=5VA8zl-EjQDNKXOrNT7sRv_vNs40Lz8aMP-sf-lf8sk,376
 modmex_lambda/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,7 +42,7 @@ modmex_lambda/shared/cookies.py,sha256=E2hTuht5_Xljw9zOQLW6vjsOWEpQSIqD2D3Tl1Co_
 modmex_lambda/shared/headers_serializer.py,sha256=Ao-wpx0cmy9E2ACrh7R7RIDUF0h24gax1AMtY_MjIWQ,2505
 modmex_lambda/shared/json_encoder.py,sha256=Mo4tlrhWvlBhhRYoPt2PAP6b_KsEKbk1pK6e5q0gbuk,1297
 modmex_lambda/shared/types.py,sha256=lH3i9MF7EQa1et8dD_qagEjlNzqznNHc0YZawp3toMc,134
-modmex_lambda-0.1.0.dist-info/METADATA,sha256=HOUUd4hbMrZTGBW045M_ltsC9-myVmZiUV9Jt51JHRo,8936
-modmex_lambda-0.1.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-modmex_lambda-0.1.0.dist-info/licenses/LICENSE,sha256=_C2TDTOsYeJvE4vn9VB51laKvleBKbdNnn96wJVtXhQ,1063
-modmex_lambda-0.1.0.dist-info/RECORD,,
+modmex_lambda-0.2.0.dist-info/METADATA,sha256=J_gbX6PVZhgRU5pv3fnY3pGeL1Mc1NzO9EznRQ4BTcI,10816
+modmex_lambda-0.2.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+modmex_lambda-0.2.0.dist-info/licenses/LICENSE,sha256=_C2TDTOsYeJvE4vn9VB51laKvleBKbdNnn96wJVtXhQ,1063
+modmex_lambda-0.2.0.dist-info/RECORD,,