engin 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

engin/_assembler.py

@@ -141,7 +141,44 @@ class Assembler:
             return value  # type: ignore[return-value]
 
     def has(self, type_: type[T]) -> bool:
-        return type_id_of(type_) in self._providers
+        """
+        Returns True if this Assembler has a provider for the given type.
+
+        Args:
+            type_: the type to check.
+
+        Returns:
+            True if the Assembler has a provider for type else False.
+        """
+        type_id = type_id_of(type_)
+        if type_id.multi:
+            return type_id in self._multiproviders
+        else:
+            return type_id in self._providers
+
+    def add(self, provider: Provide) -> None:
+        """
+        Add a provider to the Assembler post-initialisation.
+
+        Args:
+            provider: the Provide instance to add.
+
+        Returns:
+             None
+
+        Raises:
+            ValueError: if a provider for this type already exists.
+        """
+        type_id = provider.return_type_id
+        if provider.is_multiprovider:
+            if type_id in self._multiproviders:
+                self._multiproviders[type_id].append(provider)
+            else:
+                self._multiproviders[type_id] = [provider]
+        else:
+            if type_id in self._providers:
+                raise ValueError(f"A provider for '{type_id}' already exists")
+            self._providers[type_id] = provider
 
     def _resolve_providers(self, type_id: TypeId) -> Collection[Provide]:
         if type_id.multi:

engin/_dependency.py

@@ -158,6 +158,15 @@ class Provide(Dependency[Any, T]):
         super().__init__(func=builder, block_name=block_name)
         self._is_multi = typing.get_origin(self.return_type) is list
 
+        # Validate that the provider does to depend on its own output value, as this will
+        # cause a recursion error and is undefined behaviour wise.
+        if any(
+            self.return_type == param.annotation
+            for param in self.signature.parameters.values()
+        ):
+            raise ValueError("A provider cannot depend on its own return type")
+
+        # Validate that multiproviders only return a list of one type.
         if self._is_multi:
             args = typing.get_args(self.return_type)
             if len(args) != 1:

engin/_type_utils.py

@@ -1,8 +1,9 @@
 import typing
 from dataclasses import dataclass
+from types import UnionType
 from typing import Any
 
-_implict_modules = ["builtins", "typing", "collections.abc"]
+_implict_modules = ["builtins", "typing", "collections.abc", "types"]
 
 
 @dataclass(frozen=True, eq=True, slots=True)
@@ -43,7 +44,7 @@ class TypeId:
 def _args_to_str(type_: Any) -> str:
     args = typing.get_args(type_)
     if args:
-        arg_str = f"{type_.__name__}["
+        arg_str = "Union[" if isinstance(type_, UnionType) else f"{type_.__name__}["
         for idx, arg in enumerate(args):
             if isinstance(arg, list):
                 arg_str += "["

engin/ext/asgi.py

@@ -1,9 +1,10 @@
+import contextlib
 import traceback
 from collections.abc import AsyncIterator, Awaitable, Callable, MutableMapping
 from contextlib import AbstractAsyncContextManager, asynccontextmanager
 from typing import Any, ClassVar, Protocol, TypeAlias
 
-from engin import Engin, Entrypoint, Option
+from engin import Engin, Entrypoint, Option, Supply
 
 __all__ = ["ASGIEngin", "ASGIType", "engin_to_lifespan"]
 
@@ -79,7 +80,13 @@ def engin_to_lifespan(engin: Engin) -> Callable[[ASGIType], AbstractAsyncContext
     """
 
     @asynccontextmanager
-    async def engin_lifespan(_: ASGIType) -> AsyncIterator[None]:
+    async def engin_lifespan(app: ASGIType) -> AsyncIterator[None]:
+        # ensure the Engin
+        with contextlib.suppress(ValueError):
+            engin.assembler.add(Supply(app))
+
+        app.state.assembler = engin.assembler  # type: ignore[attr-defined]
+
         await engin.start()
         yield
         await engin.stop()

engin/ext/fastapi.py

@@ -6,7 +6,7 @@ from typing import ClassVar, TypeVar
 
 from fastapi.routing import APIRoute
 
-from engin import Engin, Entrypoint, Invoke, Option
+from engin import Assembler, Engin, Entrypoint, Invoke, Option
 from engin._dependency import Dependency, Supply, _noop
 from engin._graph import DependencyGrapher, Node
 from engin._type_utils import TypeId, type_id_of
@@ -24,15 +24,16 @@ except ImportError as err:
 __all__ = ["APIRouteDependency", "FastAPIEngin", "Inject"]
 
 
-def _attach_engin(
-    app: FastAPI,
-    engin: Engin,
-) -> None:
-    app.state.engin = engin
+def _attach_assembler(app: FastAPI, engin: Engin) -> None:
+    """
+    An invocation that attaches the Engin's Assembler to the FastAPI application, enabling
+    the Inject marker.
+    """
+    app.state.assembler = engin.assembler
 
 
 class FastAPIEngin(ASGIEngin):
-    _LIB_OPTIONS: ClassVar[list[Option]] = [*ASGIEngin._LIB_OPTIONS, Invoke(_attach_engin)]
+    _LIB_OPTIONS: ClassVar[list[Option]] = [*ASGIEngin._LIB_OPTIONS, Invoke(_attach_assembler)]
     _asgi_type = FastAPI
 
     def graph(self) -> list[Node]:
@@ -40,7 +41,7 @@ class FastAPIEngin(ASGIEngin):
         return grapher.resolve(
             [
                 Entrypoint(self._asgi_type),
-                *[i for i in self._invocations if i.func_name != "_attach_engin"],
+                *[i for i in self._invocations if i.func_name != "_attach_assembler"],
             ]
         )
 
@@ -50,8 +51,11 @@ T = TypeVar("T")
 
 def Inject(interface: type[T]) -> Depends:
     async def inner(conn: HTTPConnection) -> T:
-        engin: Engin = conn.app.state.engin
-        return await engin.assembler.get(interface)
+        try:
+            assembler: Assembler = conn.app.state.assembler
+        except AttributeError:
+            raise RuntimeError("Assembler is not attached to Application state") from None
+        return await assembler.get(interface)
 
     dep = Depends(inner)
     dep.__engin__ = True  # type: ignore[attr-defined]

{engin-0.0.11.dist-info → engin-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: engin
-Version: 0.0.11
+Version: 0.0.13
 Summary: An async-first modular application framework
 Project-URL: Homepage, https://github.com/invokermain/engin
 Project-URL: Documentation, https://engin.readthedocs.io/en/latest/

{engin-0.0.11.dist-info → engin-0.0.13.dist-info}/RECORD

@@ -1,20 +1,20 @@
 engin/__init__.py,sha256=yTc8k0HDGMIrxDdEEA90qGD_dExQjVIbXCyaOFRrnMg,508
-engin/_assembler.py,sha256=6n8RBOwano3U3WM1P8Y6HLHo8IuPD_7jUMoTHBJoEA8,7713
+engin/_assembler.py,sha256=1ODW3HenDlIQLetg0LNEPPbsI6HkFnPU_AHzkR9Zxmc,8844
 engin/_block.py,sha256=0QJtqyP5uTFjXsdVGr4ZONLI2LhfzUKmQGnNQWouB3o,2121
-engin/_dependency.py,sha256=URAuzA8pfLxAnwhrEZQGqO1wNCVN-WQLlFg1j1Kn-vs,6380
+engin/_dependency.py,sha256=RWOyGpMFp_5aLq5TP2wLKz0HT5f6CRoLvFyWvVif9jY,6825
 engin/_engin.py,sha256=MTE4MkLrK45h0Nv7p5H92Kv5URa1nX246B9Pp1JkM3A,9134
 engin/_exceptions.py,sha256=fsc4pTOIGHUh0x7oZhEXPJUTE268sIhswLoiqXaudiw,635
 engin/_graph.py,sha256=1pMB0cr--uS0XJycDb1rS_X45RBpoyA6NkKqbeSuz1Q,1628
 engin/_lifecycle.py,sha256=_jQnGFj4RYXsxMpcXPJQagFOwnoTVh7oSN8oUYoYuW0,3246
-engin/_type_utils.py,sha256=C71kX2Dr-gluGSL018K4uihX3zkTe7QNWaHhFU10ZmA,2127
+engin/_type_utils.py,sha256=EGyKZWuE2ZwuMlSgDhM1znF8giaEET1vcVoQcdGxFGQ,2210
 engin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engin/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-engin/ext/asgi.py,sha256=PCnemGVVB0jUZVcphz7y283sZ7D5Gog1o6rJ6g2TuCQ,2944
-engin/ext/fastapi.py,sha256=whlzhkyG0l-fF2JQ0IeBBtg1NjwjaIUxKrM3FuAgKyE,5885
+engin/ext/asgi.py,sha256=RUxkG03VTlvI6EG19c1nEJY8FnQw6MQwolfJSFnhUFE,3168
+engin/ext/fastapi.py,sha256=GO3AIZNQ69MtzbWuACffx_6Pp34wC5a5Fi_fIAaQvTg,6186
 engin/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engin/scripts/graph.py,sha256=por62FkzcWx72V2Ha9sIoki-o99fe2Ifm1w-mdoHZIQ,5922
-engin-0.0.11.dist-info/METADATA,sha256=p63ZZiEGzl4jLTj6mQc0n7t-rLoStbp-c5vKI49cF2Y,2291
-engin-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-engin-0.0.11.dist-info/entry_points.txt,sha256=Dehk4j5nK6zyuQtgOSRAoLE609V6eLzEp32bjqhO62Q,64
-engin-0.0.11.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
-engin-0.0.11.dist-info/RECORD,,
+engin-0.0.13.dist-info/METADATA,sha256=dLFQgnZcD2c_xfKK-Z-Mx_f6_Q0kCta-XqNgqrEqRmo,2291
+engin-0.0.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+engin-0.0.13.dist-info/entry_points.txt,sha256=Dehk4j5nK6zyuQtgOSRAoLE609V6eLzEp32bjqhO62Q,64
+engin-0.0.13.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
+engin-0.0.13.dist-info/RECORD,,