anydi 0.62.0__py3-none-any.whl → 0.64.0__py3-none-any.whl

anydi/_container.py

@@ -272,6 +272,10 @@ class Container:
         # Register the scope
         self._scopes[scope] = tuple({scope, "singleton"} | set(parents))
 
+    def has_scope(self, scope: str) -> bool:
+        """Check if a scope is registered."""
+        return scope in self._scopes
+
     def get_context_scopes(self, scopes: set[Scope] | None = None) -> list[str]:  # noqa: C901
         """Return scopes that require context management in dependency order."""
         # Build execution order: singleton -> request -> custom (by depth)
@@ -431,6 +435,10 @@ class Container:
         parameters: list[ProviderParameter] = []
         scope_provider: dict[Scope, Provider] = {}
 
+        # Precompute constant checks
+        is_scoped = scope not in ("singleton", "transient")
+        has_defaults = defaults is not None
+
         for parameter in signature.parameters.values():
             if parameter.annotation is inspect.Parameter.empty:
                 raise TypeError(
@@ -450,10 +458,32 @@ class Container:
             )
             has_default = default is not NOT_SET
 
+            # Check if provider exists before attempting to register (for scoped only)
+            was_auto_registered = (
+                is_scoped and parameter.annotation not in self._providers
+            )
+
             try:
                 sub_provider = self._get_or_register_provider(parameter.annotation)
             except LookupError as exc:
-                if parameter.name in defaults if defaults else False or has_default:
+                if (has_defaults and parameter.name in defaults) or has_default:
+                    continue
+                # For request/custom scopes, allow unregistered dependencies
+                # They might be provided via context.set()
+                if is_scoped:
+                    # Add to unresolved list to provide better error messages
+                    # and prevent infinite recursion
+                    self._resolver.add_unresolved(parameter.annotation)
+                    parameters.append(
+                        ProviderParameter(
+                            name=parameter.name,
+                            annotation=parameter.annotation,
+                            default=default,
+                            has_default=has_default,
+                            provider=None,  # Will check context at runtime
+                            shared_scope=True,  # Same scope, check context
+                        )
+                    )
                     continue
                 unresolved_parameter = parameter
                 unresolved_exc = exc
@@ -463,6 +493,10 @@ class Container:
             if sub_provider.scope not in scope_provider:
                 scope_provider[sub_provider.scope] = sub_provider
 
+            # If provider was auto-registered and has same scope, mark as unresolved
+            if was_auto_registered and sub_provider.scope == scope:
+                self._resolver.add_unresolved(parameter.annotation)
+
             parameters.append(
                 ProviderParameter(
                     name=parameter.name,

anydi/_resolver.py

@@ -228,11 +228,15 @@ class Resolver:
                 )
                 create_lines.append(f"        arg_{idx} = defaults['{name}']")
                 create_lines.append("    else:")
-                create_lines.append("        cached = NOT_SET_")
-                create_lines.append("        if context is not None:")
-                create_lines.append(
-                    f"            cached = context.get(_param_annotations[{idx}])"
-                )
+                # Direct dict access for shared scope params (avoids method call)
+                if param_shared_scopes[idx]:
+                    create_lines.append(
+                        f"        cached = (context._instances.get("
+                        f"_param_annotations[{idx}], NOT_SET_) "
+                        f"if context is not None else NOT_SET_)"
+                    )
+                else:
+                    create_lines.append("        cached = NOT_SET_")
                 create_lines.append("        if cached is NOT_SET_:")
                 create_lines.append(
                     f"            if _param_annotations[{idx}] in "

anydi/ext/fastapi.py

@@ -8,8 +8,8 @@ from typing import Annotated, Any, cast
 
 from fastapi import Depends, FastAPI, params
 from fastapi.dependencies.models import Dependant
-from fastapi.routing import APIRoute
-from starlette.requests import Request
+from fastapi.routing import APIRoute, APIWebSocketRoute
+from starlette.requests import HTTPConnection
 
 from anydi import Container, Inject
 from anydi._marker import Marker, extend_marker
@@ -19,9 +19,8 @@ from .starlette.middleware import RequestScopedMiddleware
 __all__ = ["install", "get_container", "Inject", "RequestScopedMiddleware"]
 
 
-def get_container(request: Request) -> Container:
-    """Get the AnyDI container from a FastAPI request."""
-    return cast(Container, request.app.state.container)
+def get_container(connection: HTTPConnection) -> Container:
+    return cast(Container, connection.app.state.container)
 
 
 class FastAPIMarker(params.Depends, Marker):
@@ -39,7 +38,9 @@ class FastAPIMarker(params.Depends, Marker):
         return await container.aresolve(self.interface)
 
 
-# Configure Inject() and Provide[T] to use FastAPI-specific marker
+# Configure Inject() and Provide[T] to use FastAPI-specific marker at import time
+# This is also called in install() to ensure it's set correctly even if other
+# extensions have overwritten it
 extend_marker(FastAPIMarker)
 
 
@@ -51,7 +52,9 @@ def _iter_dependencies(dependant: Dependant) -> Iterator[Dependant]:
 
 
 def _validate_route_dependencies(
-    route: APIRoute, container: Container, patched: set[tuple[Any, ...]]
+    route: APIRoute | APIWebSocketRoute,
+    container: Container,
+    patched: set[tuple[Any, ...]],
 ) -> None:
     for dependant in _iter_dependencies(route.dependant):
         if dependant.cache_key in patched:
@@ -71,8 +74,14 @@ def _validate_route_dependencies(
 def install(app: FastAPI, container: Container) -> None:
     """Install AnyDI into a FastAPI application."""
     app.state.container = container  # noqa
+
+    # Register websocket scope with request as parent if not already registered
+    if not container.has_scope("websocket"):
+        container.register_scope("websocket", parents=["request"])
+
+    # Validate routes (both HTTP and WebSocket)
     patched: set[tuple[Any, ...]] = set()
     for route in app.routes:
-        if not isinstance(route, APIRoute):
+        if not isinstance(route, APIRoute | APIWebSocketRoute):
             continue
         _validate_route_dependencies(route, container, patched)

anydi/ext/starlette/middleware.py

@@ -1,23 +1,49 @@
-"""Starlette RequestScopedMiddleware."""
+"""Starlette middleware for AnyDI scoped contexts."""
+
+from __future__ import annotations
+
+from contextlib import AsyncExitStack
 
-from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.requests import Request
-from starlette.responses import Response
-from starlette.types import ASGIApp
+from starlette.types import ASGIApp, Receive, Scope, Send
+from starlette.websockets import WebSocket
 
 from anydi import Container
 
 
-class RequestScopedMiddleware(BaseHTTPMiddleware):
-    """Starlette middleware for managing request-scoped AnyDI context."""
+class RequestScopedMiddleware:
+    """ASGI middleware for managing request-scoped AnyDI context."""
 
     def __init__(self, app: ASGIApp, container: Container) -> None:
-        super().__init__(app)
+        self.app = app
         self.container = container
 
-    async def dispatch(
-        self, request: Request, call_next: RequestResponseEndpoint
-    ) -> Response:
-        async with self.container.arequest_context() as context:
-            context.set(Request, request)
-            return await call_next(request)
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        # Only handle HTTP requests or WebSocket connections
+        if scope["type"] not in {"http", "websocket"}:
+            await self.app(scope, receive, send)
+            return
+
+        async with AsyncExitStack() as stack:
+            # Create request context first (parent scope)
+            request_context = await stack.enter_async_context(
+                self.container.arequest_context()
+            )
+
+            # For WebSocket connections, create websocket context (child scope)
+            websocket_context = None
+            if scope["type"] == "websocket" and self.container.has_scope("websocket"):
+                websocket_context = await stack.enter_async_context(
+                    self.container.ascoped_context("websocket")
+                )
+
+            if scope["type"] == "http":
+                request = Request(scope, receive=receive, send=send)
+                request_context.set(Request, request)
+            else:
+                websocket = WebSocket(scope, receive=receive, send=send)
+                request_context.set(WebSocket, websocket)
+                if websocket_context is not None:
+                    websocket_context.set(WebSocket, websocket)
+
+            await self.app(scope, receive, send)

{anydi-0.62.0.dist-info → anydi-0.64.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.62.0
+Version: 0.64.0
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov
@@ -42,6 +42,7 @@ Modern, lightweight Dependency Injection library using type annotations.
 [![CI](https://github.com/antonrh/anydi/actions/workflows/ci.yml/badge.svg)](https://github.com/antonrh/anydi/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/antonrh/anydi/branch/main/graph/badge.svg)](https://codecov.io/gh/antonrh/anydi)
 [![Documentation](https://readthedocs.org/projects/anydi/badge/?version=latest)](https://anydi.readthedocs.io/en/latest/)
+[![CodSpeed](https://img.shields.io/endpoint?url=https://codspeed.io/badge.json)](https://codspeed.io/antonrh/anydi?utm_source=badge)
 
 </div>
 
@@ -229,7 +230,7 @@ Configure Django (`settings.py`):
 
 ```python
 INSTALLED_APPS = [
-    ...
+    ...,
     "anydi_django",
 ]
 

{anydi-0.62.0.dist-info → anydi-0.64.0.dist-info}/RECORD

@@ -1,27 +1,27 @@
 anydi/__init__.py,sha256=KFX8OthKXwBuYDPCV61t-044DpJ88tAOzIxeUWRC5OA,633
 anydi/_async_lock.py,sha256=3dwZr0KthXFYha0XKMyXf8jMmGb1lYoNC0O5w29V9ic,1104
-anydi/_container.py,sha256=fXRJGMprZ5heLsVBEy0Ma_tCTciiK2_Qdsb1HW36tj8,27972
+anydi/_container.py,sha256=VbC5WqVH78TtaPx3JbSyZP8gZA4NbPNuwEiJXZSDSks,29561
 anydi/_context.py,sha256=-9QqeMWo9OpZVXZxZCQgIsswggl3Ch7lgx1KiFX_ezc,3752
 anydi/_decorators.py,sha256=J3W261ZAG7q4XKm4tbAv1wsWr9ysx9_5MUbUvSJB_MQ,2809
 anydi/_injector.py,sha256=1Ux71DhGxu3dLwPJP8gU73olI0pcZ3_tVaVzwKH7100,4411
 anydi/_marker.py,sha256=xVydjGdkxd_DqqwttnJZRkQbhpCTE9OnrhFmFJMlgvI,3415
 anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
 anydi/_provider.py,sha256=OV1WFHTYv7W2U0XDk_Kql1r551Vhq8o-pUV5ep1HQcU,1574
-anydi/_resolver.py,sha256=dMtWU4OHWMYP7J2Rks0sdwyjLHF1uKo77lnvTGhhtBo,30222
+anydi/_resolver.py,sha256=fh8pB6gDZ-jWXh_q2QLM--g9tWZ0Dyx8MPjGcLVyiOw,30428
 anydi/_scanner.py,sha256=rbRkHzyd2zMu7AFLffN6_tZJcMaW9gy7E-lVdHLHYrs,4294
 anydi/_types.py,sha256=lsShY_-_CM2EFajeknAYXvLl-rHfopBT8udnK5_BtS4,1161
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
-anydi/ext/fastapi.py,sha256=ExDuCLtKB4DBk0GUe70JSzAfyKJs-BcPvHINsXoNVos,2560
+anydi/ext/fastapi.py,sha256=px6gdRVIE8-thDy93Zcsd_xJF3H09n1nn7FKKemdiig,2958
 anydi/ext/faststream.py,sha256=yszUfSbo3vJ2tr9PNC2GR-uX1XgRSXGH2lvLNoAXkc4,2738
 anydi/ext/pydantic_settings.py,sha256=jVJZ1wPaPpsxdNPlJj9yq282ebqLZ9tckWpZ0eIwWLg,1533
 anydi/ext/pytest_plugin.py,sha256=M54DkA-KxD9GqLnXdoCyn-Qur2c44MB6d0AgJuYCZ5w,16171
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
+anydi/ext/starlette/middleware.py,sha256=n_JJ7BcG2Mg2M5HwM_SBboxZ-mnnD6WWJn4khq7Bgbs,1860
 anydi/ext/typer.py,sha256=z-sDd3jZMPTE2CyEuJ0f9uIJB43FjoLWbjpnkOvqSKA,6236
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
-anydi-0.62.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.62.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.62.0.dist-info/METADATA,sha256=eWtDMEmZnfsaNCmqZ2CN1AS5DzE5gk4swTQCHcDg0WM,8007
-anydi-0.62.0.dist-info/RECORD,,
+anydi-0.64.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.64.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.64.0.dist-info/METADATA,sha256=0Ic_f7pbgpkUG3Mp11D1uSJ8VJ98vfPkY6x3_-_w5rU,8142
+anydi-0.64.0.dist-info/RECORD,,