modmex-lambda 0.1.0__tar.gz → 0.2.0__tar.gz

{modmex_lambda-0.1.0 → modmex_lambda-0.2.0}/.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   test:
+    name: CI Tests
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

modmex_lambda-0.1.0/README.md → modmex_lambda-0.2.0/PKG-INFO

@@ -1,3 +1,18 @@
+Metadata-Version: 2.4
+Name: modmex-lambda
+Version: 0.2.0
+Summary: Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling.
+Author: Modmex
+License: MIT
+License-File: LICENSE
+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
 
 Ultra-lightweight AWS Lambda utilities for API Gateway-first workloads.
@@ -13,11 +28,17 @@ logging with a small dependency footprint.
 pip install modmex-lambda
 ```
 
-For local development:
+
+To use the optional `injector` integration:
 
 ```bash
-poetry install --extras dev
-poetry run pytest -q
+pip install "modmex-lambda[injector]"
+```
+
+With Poetry:
+
+```bash
+poetry add "modmex-lambda[injector]"
 ```
 
 ## API Gateway Resolvers
@@ -223,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/PKG-INFO → modmex_lambda-0.2.0/README.md

@@ -1,16 +1,3 @@
-Metadata-Version: 2.4
-Name: modmex-lambda
-Version: 0.1.0
-Summary: Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling.
-Author: Modmex
-License: MIT
-License-File: LICENSE
-Requires-Python: >=3.10
-Requires-Dist: modmex<2.0.0,>=1.1.10
-Provides-Extra: dev
-Requires-Dist: pytest>=8.0; extra == 'dev'
-Description-Content-Type: text/markdown
-
 # modmex-lambda
 
 Ultra-lightweight AWS Lambda utilities for API Gateway-first workloads.
@@ -26,11 +13,17 @@ logging with a small dependency footprint.
 pip install modmex-lambda
 ```
 
-For local development:
+
+To use the optional `injector` integration:
 
 ```bash
-poetry install --extras dev
-poetry run pytest -q
+pip install "modmex-lambda[injector]"
+```
+
+With Poetry:
+
+```bash
+poetry add "modmex-lambda[injector]"
 ```
 
 ## API Gateway Resolvers
@@ -236,6 +229,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 → modmex_lambda-0.2.0}/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-0.1.0 → modmex_lambda-0.2.0}/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-0.1.0 → modmex_lambda-0.2.0}/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-0.2.0/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-0.1.0 → modmex_lambda-0.2.0}/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-0.1.0 → modmex_lambda-0.2.0}/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-0.1.0 → modmex_lambda-0.2.0}/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-0.1.0 → modmex_lambda-0.2.0}/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 → modmex_lambda-0.2.0}/poetry.lock

@@ -167,6 +167,22 @@ files = [
 ]
 markers = {main = "extra == \"dev\""}
 
+[[package]]
+name = "injector"
+version = "0.24.0"
+description = "Injector - Python dependency injection framework, inspired by Guice"
+optional = true
+python-versions = "*"
+groups = ["main"]
+markers = "extra == \"injector\""
+files = [
+    {file = "injector-0.24.0-py3-none-any.whl", hash = "sha256:47294c7a7fdb811f0d1b442a1e0152bb2fc28b2ccaaba4cba44e5e125e0da2d0"},
+    {file = "injector-0.24.0.tar.gz", hash = "sha256:e85a75d1516cff2f03170f3fd1219f56acb25c9a05e307819ae0dcde3dad3d3f"},
+]
+
+[package.extras]
+dev = ["black (==24.3.0) ; implementation_name == \"cpython\"", "build (==1.0.3)", "check-manifest (==0.49)", "click (==8.1.7)", "coverage[toml] (==7.3.2)", "exceptiongroup (==1.2.0)", "importlib-metadata (==7.0.0)", "iniconfig (==2.0.0)", "mypy (==1.7.1) ; implementation_name == \"cpython\"", "mypy-extensions (==1.0.0)", "packaging (==25.0)", "pathspec (==0.12.1)", "platformdirs (==4.1.0)", "pluggy (==1.3.0)", "pyproject-hooks (==1.0.0)", "pytest (==7.4.3)", "pytest-cov (==4.1.0)", "tomli (==2.0.1)", "typing-extensions (==4.9.0) ; python_version < \"3.9\"", "zipp (==3.19.1)"]
+
 [[package]]
 name = "modmex"
 version = "1.1.10"
@@ -432,8 +448,9 @@ markers = {main = "extra == \"dev\" and python_version == \"3.10\"", dev = "pyth
 
 [extras]
 dev = ["pytest"]
+injector = ["injector"]
 
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10"
-content-hash = "7417c68d7731202521d408794e74b5caacc8d03b334529a981c6f8c867174b90"
+content-hash = "76e16dbf080a877a8ede81c719d72cd7a6023c75506305088b55d814d3cae4a4"

{modmex_lambda-0.1.0 → modmex_lambda-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "modmex-lambda"
-version = "0.1.0"
+version = "0.2.0"
 description = "Ultra-lightweight AWS Lambda utilities for API Gateway routing and event handling."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -16,6 +16,7 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = ["pytest>=8.0"]
+injector = ["injector>=0.24.0,<1.0.0"]
 
 [tool.pytest.ini_options]
 pythonpath = ["."]

{modmex_lambda-0.1.0 → modmex_lambda-0.2.0}/tests/event_handler/test_api_gateway.py

@@ -29,6 +29,35 @@ class CreateUserRequest:
         self.age = age
 
 
+class Settings:
+    def __init__(self, tenant_id: str) -> None:
+        self.tenant_id = tenant_id
+
+
+class UserRepository:
+    def __init__(self, settings: Settings) -> None:
+        self.settings = settings
+
+    def get_user(self, user_id: int) -> dict[str, str | int]:
+        return {"id": user_id, "tenant_id": self.settings.tenant_id}
+
+
+class UserService:
+    def __init__(self, repository: UserRepository) -> None:
+        self.repository = repository
+
+    def get_user(self, user_id: int) -> dict[str, str | int]:
+        return self.repository.get_user(user_id)
+
+
+class AuditService:
+    def __init__(self, tenant_id: str) -> None:
+        self.tenant_id = tenant_id
+
+    def record(self, user_id: int) -> dict[str, str | int]:
+        return {"user_id": user_id, "tenant_id": self.tenant_id}
+
+
 def test_public_api_requires_explicit_api_gateway_resolver() -> None:
     assert modmex_lambda.ApiGatewayHttpResolver is ApiGatewayHttpResolver
     assert modmex_lambda.ApiGatewayRestResolver is ApiGatewayRestResolver
@@ -437,6 +466,97 @@ def test_dependency_injection_without_cache() -> None:
     assert response_body(response) == {"a": 1, "b": 2}
 
 
+def test_dependency_injection_uses_custom_dependency_resolver_for_annotation_token() -> None:
+    class UserService:
+        def __init__(self, tenant_id: str) -> None:
+            self.tenant_id = tenant_id
+
+    class Resolver:
+        def resolve(self, dependency, *, values=None, request=None):
+            assert dependency is UserService
+            assert values == {}
+            assert request.headers["x-tenant-id"] == "mx"
+            return UserService(tenant_id="mx")
+
+    app = ApiGatewayHttpResolver(dependency_resolver=Resolver())
+
+    @app.get("/di-resolver")
+    def handler(service: Annotated[UserService, Depends()]):
+        return {"tenant_id": service.tenant_id}
+
+    response = app.resolve(http_v2_event("GET", "/di-resolver", headers={"x-tenant-id": "mx"}), object())
+
+    assert response_body(response) == {"tenant_id": "mx"}
+
+
+def test_http_resolver_supports_real_injector_class_token_dependency() -> None:
+    pytest.importorskip("injector")
+    from injector import Injector, Module, inject, provider, singleton
+    from modmex_lambda import InjectorDependencyResolver
+
+    class MyModule(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([MyModule()])
+    app = ApiGatewayHttpResolver(dependency_resolver=InjectorDependencyResolver(container))
+
+    @app.get("/injector/users/<user_id>")
+    def handler(
+        user_id: Annotated[int, Path()],
+        service: Annotated[UserService, Depends()],
+    ):
+        return service.get_user(user_id)
+
+    response = app.resolve(http_v2_event("GET", "/injector/users/42"), object())
+
+    assert response_body(response) == {"id": 42, "tenant_id": "mx"}
+
+
+def test_rest_resolver_supports_real_injector_factory_dependency() -> None:
+    pytest.importorskip("injector")
+    from injector import Injector, Module, inject, provider, singleton
+    from modmex_lambda import InjectorDependencyResolver
+
+    class MyModule(Module):
+        @singleton
+        @provider
+        def provide_settings(self) -> Settings:
+            return Settings(tenant_id="mx")
+
+    @inject
+    def get_audit_service(settings: Settings) -> AuditService:
+        return AuditService(settings.tenant_id)
+
+    container = Injector([MyModule()])
+    app = ApiGatewayRestResolver(dependency_resolver=InjectorDependencyResolver(container))
+
+    @app.get("/injector/audit/<user_id>")
+    def handler(
+        user_id: Annotated[int, Path()],
+        audit: Annotated[AuditService, Depends(get_audit_service)],
+    ):
+        return audit.record(user_id)
+
+    response = app.resolve(rest_event("GET", "/injector/audit/7"), object())
+
+    assert response_body(response) == {"user_id": 7, "tenant_id": "mx"}
+
+
 def test_validation_error_maps_to_400() -> None:
     app = ApiGatewayHttpResolver()
 

{modmex_lambda-0.1.0 → modmex_lambda-0.2.0}/tests/event_handler/test_dependencies.py

@@ -39,6 +39,7 @@ from modmex_lambda.event_handler.dependencies.depends import (
     DependencyParam,
     DependencyResolutionError,
     Depends,
+    InjectorDependencyResolver,
     build_dependency_tree,
     solve_dependencies,
 )
@@ -120,6 +121,15 @@ def endpoint_with_broken_dependency(value: Annotated[str, Depends(broken_depende
     return None
 
 
+class ComplexService:
+    def __init__(self, dependency: object) -> None:
+        self.dependency = dependency
+
+
+def endpoint_with_annotation_dependency(service: Annotated[ComplexService, Depends()]) -> None:
+    return None
+
+
 def _field(
     name: str,
     annotation: Any,
@@ -149,6 +159,15 @@ def test_depends_rejects_non_callable_and_extracts_annotated_dependency() -> Non
     assert compat._normalize_errors([{"loc": ("x",), "type": "missing"}]) == [{"loc": ("x",), "type": "missing"}]
 
 
+def test_depends_without_callable_uses_parameter_annotation_as_dependency_token() -> None:
+    tree = build_dependency_tree(endpoint_with_annotation_dependency)
+
+    assert len(tree.dependencies) == 1
+    assert tree.dependencies[0].param_name == "service"
+    assert tree.dependencies[0].depends.dependency is ComplexService
+    assert tree.dependencies[0].dependant.dependencies == []
+
+
 def test_solve_dependencies_supports_cache_overrides_request_and_errors() -> None:
     CALLS["token"] = 0
     event = APIGatewayProxyEventV2(http_v2_event("GET", "/items", headers={"x-tenant-id": "mx"}))
@@ -170,6 +189,34 @@ def test_solve_dependencies_supports_cache_overrides_request_and_errors() -> Non
         solve_dependencies(dependant=build_dependency_tree(endpoint_with_broken_dependency))
 
 
+def test_solve_dependencies_accepts_custom_dependency_resolver() -> None:
+    class Resolver:
+        def resolve(self, dependency, *, values=None, request=None):
+            assert dependency is ComplexService
+            assert values == {}
+            return ComplexService(dependency="container")
+
+    values = solve_dependencies(
+        dependant=build_dependency_tree(endpoint_with_annotation_dependency),
+        dependency_resolver=Resolver(),
+    )
+
+    assert values["service"].dependency == "container"
+
+
+def test_injector_dependency_resolver_uses_injector_get_for_class_tokens() -> None:
+    service = ComplexService(dependency="injector")
+
+    class FakeInjector:
+        def get(self, dependency):
+            assert dependency is ComplexService
+            return service
+
+    resolver = InjectorDependencyResolver(FakeInjector())
+
+    assert resolver.resolve(ComplexService) is service
+
+
 def test_solve_dependencies_honors_use_cache_false() -> None:
     CALLS["counter"] = 0