chore: incorporate upstream changes from di (#70)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xpresso"
-version = "0.18.1"
+version = "0.19.0"
 description = "A developer centric, performant Python web framework"
 authors = ["Adrian Garcia Badaracco <adrian@adriangb.com>"]
 readme = "README.md"
@@ -36,7 +36,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4"
-di = "~0.56"
+di = ">=0.58.1,<0.59.0"
 anyio = "~3"
 starlette = ">=0.16.0,<1"
 importlib-metadata = {version = ">=3", python = "<3.8"}

tests/test_extractors/body/test_field_extractors.py

@@ -6,7 +6,7 @@
 else:
     from typing import Annotated
 
-from di import Dependant
+from di import Marker
 from pydantic import BaseModel
 from starlette.responses import Response
 from starlette.testclient import TestClient
@@ -18,7 +18,7 @@
 
 
 def test_non_field_markers_are_ignored() -> None:
-    class RandomMarker(Dependant[typing.Any]):
+    class RandomMarker(Marker):
         pass
 
     class FormDataModel(BaseModel):

xpresso/applications.py

@@ -65,7 +65,7 @@ def __init__(
         routes: typing.Optional[typing.Sequence[BaseRoute]] = None,
         *,
         container: typing.Optional[BaseContainer] = None,
-        dependencies: typing.Optional[typing.List[Depends]] = None,
+        dependencies: typing.Optional[typing.List[DependantBase[typing.Any]]] = None,
         debug: bool = False,
         middleware: typing.Optional[typing.Sequence[Middleware]] = None,
         exception_handlers: typing.Optional[ExceptionHandlers] = None,

xpresso/binders/dependants.py

@@ -1,7 +1,7 @@
 import inspect
 import typing
 
-from di import Dependant
+from di import Dependant, Marker
 from di.api.dependencies import CacheKey, DependantBase
 
 from xpresso.binders.api import (
@@ -16,7 +16,7 @@
 )
 
 
-class ParameterBinderMarker(Dependant[typing.Any]):
+class ParameterBinderMarker(Marker):
     def __init__(
         self,
         *,
@@ -75,7 +75,7 @@ def __init__(
         self.extractor = extractor
 
 
-class BodyBinderMarker(Dependant[typing.Any]):
+class BodyBinderMarker(Marker):
     def __init__(
         self,
         *,

xpresso/dependencies/models.py

@@ -10,6 +10,7 @@
     from typing import Literal
 
 import di
+from di.api.dependencies import DependantBase
 from di.api.providers import DependencyProvider
 
 T = typing.TypeVar("T")
@@ -18,8 +19,7 @@
 Scope = Literal["app", "connection", "endpoint"]
 
 
-class Depends(di.Dependant[typing.Any]):
-    __slots__ = ()
+class Depends(di.Marker, di.Dependant[typing.Any]):
     scope: Scope
 
     def __init__(
@@ -38,19 +38,32 @@ def __init__(
             sync_to_thread=sync_to_thread,
         )
 
-    def initialize_sub_dependant(self, param: inspect.Parameter) -> Depends:
+    def from_callable(
+        self, call: typing.Optional[DependencyProvider]
+    ) -> DependantBase[typing.Any]:
+        return Depends(
+            call=call,
+            scope=self.scope,
+            use_cache=self.use_cache,
+            wire=self.wire,
+            sync_to_thread=self.sync_to_thread,
+        )
+
+    def initialize_sub_dependant(
+        self, param: inspect.Parameter
+    ) -> DependantBase[typing.Any]:
         if param.default is param.empty:
             # try to auto-wire
             return Depends(
                 call=None,
                 scope=self.scope,
                 use_cache=self.use_cache,
-            )
+            ).register_parameter(param)
         # has a default parameter but we create a dependency anyway just for binds
         # but do not wire it to make autowiring less brittle and less magic
         return Depends(
             call=None,
             scope=self.scope,
             use_cache=self.use_cache,
             wire=False,
-        )
+        ).register_parameter(param)

xpresso/routing/operation.py

@@ -1,11 +1,10 @@
 import typing
 
-from di import AsyncExecutor, BaseContainer, ConcurrentAsyncExecutor
+from di import AsyncExecutor, BaseContainer, ConcurrentAsyncExecutor, JoinedDependant
 from di.api.dependencies import DependantBase
 from di.api.executor import AsyncExecutorProtocol
 from di.api.providers import DependencyProvider as Endpoint
 from di.api.solved import SolvedDependant
-from di.dependant import JoinedDependant
 from starlette.datastructures import URLPath
 from starlette.requests import HTTPConnection, Request
 from starlette.responses import JSONResponse, Response
@@ -81,7 +80,9 @@ def __init__(
         responses: typing.Optional[Responses] = None,
         # xpresso params
         name: typing.Optional[str] = None,
-        dependencies: typing.Optional[typing.Sequence[Depends]] = None,
+        dependencies: typing.Optional[
+            typing.Sequence[DependantBase[typing.Any]]
+        ] = None,
         execute_dependencies_concurrently: bool = False,
         response_factory: typing.Callable[[typing.Any], Response] = JSONResponse,
         response_encoder: Encoder = JsonableEncoder(),

xpresso/routing/pathitem.py

@@ -2,11 +2,11 @@
 
 import starlette.routing
 import starlette.types
+from di.api.dependencies import DependantBase
 from di.api.providers import DependencyProvider as Endpoint
 
 import xpresso.binders.dependants as param_dependants
 import xpresso.openapi.models as openapi_models
-from xpresso.dependencies.models import Depends
 from xpresso.responses import Responses
 from xpresso.routing.operation import Operation
 
@@ -45,7 +45,9 @@ def __init__(
         options: typing.Optional[typing.Union[Operation, Endpoint]] = None,
         trace: typing.Optional[typing.Union[Operation, Endpoint]] = None,
         redirect_slashes: bool = True,
-        dependencies: typing.Optional[typing.Sequence[Depends]] = None,
+        dependencies: typing.Optional[
+            typing.Sequence[DependantBase[typing.Any]]
+        ] = None,
         # OpenAPI metadata
         include_in_schema: bool = True,
         name: typing.Optional[str] = None,

xpresso/routing/router.py

@@ -7,11 +7,11 @@
     from typing import Protocol
 
 import starlette.middleware
+from di.api.dependencies import DependantBase
 from starlette.routing import BaseRoute
 from starlette.routing import Router as StarletteRouter
 from starlette.types import Receive, Scope, Send
 
-from xpresso.dependencies.models import Depends
 from xpresso.responses import Responses
 
 
@@ -33,7 +33,7 @@ def __call__(
 class Router:
     routes: typing.Sequence[BaseRoute]
     lifespan: typing.Optional[typing.Callable[..., typing.AsyncContextManager[None]]]
-    dependencies: typing.Sequence[Depends]
+    dependencies: typing.Sequence[DependantBase[typing.Any]]
     tags: typing.Sequence[str]
     responses: Responses
     include_in_schema: bool
@@ -62,7 +62,9 @@ def __init__(
         ] = None,
         redirect_slashes: bool = True,
         default: typing.Optional[_ASGIApp] = None,
-        dependencies: typing.Optional[typing.Sequence[Depends]] = None,
+        dependencies: typing.Optional[
+            typing.Sequence[DependantBase[typing.Any]]
+        ] = None,
         tags: typing.Optional[typing.List[str]] = None,
         responses: typing.Optional[Responses] = None,
         include_in_schema: bool = True,

xpresso/routing/websockets.py

@@ -5,12 +5,11 @@
 import starlette.routing
 import starlette.types
 import starlette.websockets
-from di import AsyncExecutor, BaseContainer, ConcurrentAsyncExecutor
+from di import AsyncExecutor, BaseContainer, ConcurrentAsyncExecutor, JoinedDependant
 from di.api.dependencies import DependantBase
 from di.api.executor import AsyncExecutorProtocol
 from di.api.providers import DependencyProvider as Endpoint
 from di.api.solved import SolvedDependant
-from di.dependant import JoinedDependant
 
 import xpresso._utils.asgi_scope_extension as asgi_scope_extension
 from xpresso.dependencies.models import Depends
@@ -58,7 +57,9 @@ def __init__(
         endpoint: Endpoint,
         *,
         name: typing.Optional[str] = None,
-        dependencies: typing.Optional[typing.Sequence[Depends]] = None,
+        dependencies: typing.Optional[
+            typing.Sequence[DependantBase[typing.Any]]
+        ] = None,
         execute_dependencies_concurrently: bool = False,
     ) -> None:
         super().__init__(  # type: ignore