feat!: replace UnwiredDependant with a paramter on Dependant

di/__init__.py

@@ -11,7 +11,7 @@
 
 
 from di.container import Container
-from di.dependant import Dependant, UnwiredDependant
+from di.dependant import Dependant
 from di.params import Depends
 
-__all__ = ("Container", "Dependant", "Depends", "UnwiredDependant")
+__all__ = ("Container", "Dependant", "Depends")

di/dependant.py

@@ -11,7 +11,6 @@
     AsyncGeneratorProvider,
     CallableProvider,
     CoroutineProvider,
-    Dependency,
     DependencyProviderType,
     DependencyType,
     GeneratorProvider,
@@ -31,6 +30,7 @@ def __init__(
         call: Optional[AsyncGeneratorProvider[DependencyType]] = None,
         scope: Optional[Scope] = None,
         share: bool = True,
+        autowire: bool = True,
     ) -> None:
         ...
 
@@ -40,6 +40,7 @@ def __init__(
         call: Optional[CoroutineProvider[DependencyType]] = None,
         scope: Optional[Scope] = None,
         share: bool = True,
+        autowire: bool = True,
     ) -> None:
         ...
 
@@ -49,6 +50,7 @@ def __init__(
         call: Optional[GeneratorProvider[DependencyType]] = None,
         scope: Optional[Scope] = None,
         share: bool = True,
+        autowire: bool = True,
     ) -> None:
         ...
 
@@ -58,6 +60,7 @@ def __init__(
         call: Optional[CallableProvider[DependencyType]] = None,
         scope: Optional[Scope] = None,
         share: bool = True,
+        autowire: bool = True,
     ) -> None:
         ...
 
@@ -66,13 +69,15 @@ def __init__(
         call: Optional[DependencyProviderType[DependencyType]] = None,
         scope: Scope = None,
         share: bool = True,
+        autowire: bool = True,
     ) -> None:
         self.call = call
         self.scope = scope
         self.dependencies: Optional[
             Dict[str, DependencyParameter[DependantProtocol[Any]]]
         ] = None
         self.share = share
+        self.autowire = autowire
 
     def __repr__(self) -> str:
         share = "" if self.share is False else ", share=True"
@@ -133,7 +138,7 @@ def gather_dependencies(
                 )
             if isinstance(param.default, Dependant):
                 sub_dependant: DependantProtocol[Any] = param.default
-            elif param.default is param.empty:
+            elif param.default is param.empty and self.autowire:
                 sub_dependant = self.create_sub_dependant(param)
             else:
                 continue  # pragma: no cover
@@ -164,13 +169,9 @@ def create_sub_dependant(self, param: inspect.Parameter) -> DependantProtocol[An
             raise WiringError(
                 "Cannot wire a parameter with no default and no type annotation"
             )
-        return Dependant[Any](call=param.annotation, scope=self.scope, share=self.share)
-
-
-class UnwiredDependant(Dependant[Dependency]):
-    """A Dependant that does not autowire"""
-
-    def get_dependencies(
-        self,
-    ) -> Dict[str, DependencyParameter[DependantProtocol[Any]]]:
-        return {}
+        return Dependant[Any](
+            call=param.annotation,
+            scope=self.scope,
+            share=self.share,
+            autowire=self.autowire,
+        )

docs/src/gather_deps_example.py

@@ -1,7 +1,6 @@
 from typing import Any, FrozenSet, Iterable, List
 
 from di import Container, Dependant
-from di.dependant import UnwiredDependant
 from di.types.dependencies import DependantProtocol
 
 
@@ -36,9 +35,8 @@ def gather_scopes(deps: List[DependantProtocol[Any]]) -> List[str]:
 async def web_framework() -> None:
     container = Container()
 
-    # note: use UnwiredDependant so that the container doesn't try
-    # to wire the Request itself
-    with container.bind(UnwiredDependant(Request), Request):
+    # note: use autowire=False so that the container doesn't try to wire the Request itself
+    with container.bind(Dependant(Request, autowire=False), Request):
         scopes = gather_scopes(
             container.solve(Dependant(controller)).get_flat_subdependants()
         )

docs/src/solved_dependant.py

@@ -2,7 +2,7 @@
 
 import anyio
 
-from di import Container, Dependant, UnwiredDependant
+from di import Container, Dependant
 from di.types.solved import SolvedDependency
 
 T = TypeVar("T")
@@ -27,7 +27,7 @@ async def framework() -> None:
     container = Container()
     request_log = RequestLog()
     container.bind(Dependant(lambda: request_log, scope="app"), RequestLog)
-    container.bind(UnwiredDependant(Request, scope="request"), Request)
+    container.bind(Dependant(Request, scope="request", autowire=False), Request)
     solved = container.solve(Dependant(controller, scope="request"))
     async with container.enter_global_scope("app"):
         # simulate concurrent requests

docs/src/starlette/src.py

@@ -7,7 +7,7 @@
 from starlette.requests import Request
 from starlette.routing import Route
 
-from di import Container, Dependant, UnwiredDependant
+from di import Container, Dependant
 
 
 class WiredGetRoute(Route):
@@ -32,7 +32,7 @@ async def wrapped_endpoint(request: Request) -> Any:
 class App(Starlette):
     def __init__(self, container: Container | None = None, **kwargs: Any) -> None:
         self.container = container or Container()
-        self.container.bind(UnwiredDependant(Request), Request)
+        self.container.bind(Dependant(Request, autowire=False), Request)
 
         @contextlib.asynccontextmanager
         async def lifespan(app: App):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "di"
-version = "0.13.0"
+version = "0.14.0"
 description = "Autowiring dependency injection"
 authors = ["Adrian Garcia Badaracco <[email protected]>"]
 readme = "README.md"