engin 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

engin/_dependency.py

@@ -136,7 +136,7 @@ class Provide(Dependency[Any, T]):
             return_type = self._func  # __init__ returns self
         else:
             try:
-                return_type = get_type_hints(self._func)["return"]
+                return_type = get_type_hints(self._func, include_extras=True)["return"]
             except KeyError as err:
                 raise RuntimeError(
                     f"Dependency '{self.name}' requires a return typehint"

engin/_engin.py

@@ -35,8 +35,7 @@ class Engin:
     Supply) and at least one invocation (Invoke or Entrypoint).
 
     When instantiated the Engin can be run. This is typically done via the `run` method,
-    but certain use cases, e.g. testing, it can be easier to use the `start` and `stop`
-    methods.
+    but for advanced usecases it can be easier to use the `start` and `stop` methods.
 
     When ran the Engin takes care of the complete application lifecycle:
     1. The Engin assembles all Invocations. Only Providers that are required to satisfy
@@ -81,8 +80,6 @@ class Engin:
         Args:
             *options: an instance of Provide, Supply, Invoke, Entrypoint or a Block.
         """
-        self._providers: dict[TypeId, Provide] = {TypeId.from_type(Engin): Provide(self._self)}
-        self._invokables: list[Invoke] = []
 
         self._stop_requested_event = Event()
         self._stop_complete_event = Event()
@@ -90,8 +87,16 @@ class Engin:
         self._shutdown_task: Task | None = None
         self._run_task: Task | None = None
 
+        # TODO: refactor _destruct_options and related attributes into a dedicated class?
+        self._providers: dict[TypeId, Provide] = {TypeId.from_type(Engin): Provide(self._self)}
+        self._multiproviders: dict[TypeId, list[Provide]] = {}
+        self._invocations: list[Invoke] = []
+        # populates the above
         self._destruct_options(chain(self._LIB_OPTIONS, options))
-        self._assembler = Assembler(self._providers.values())
+        multi_providers = [p for multi in self._multiproviders.values() for p in multi]
+        self._assembler = Assembler(chain(self._providers.values(), multi_providers))
+        self._providers.clear()
+        self._multiproviders.clear()
 
     @property
     def assembler(self) -> Assembler:
@@ -119,7 +124,7 @@ class Engin:
         """
         LOG.info("starting engin")
         assembled_invocations: list[AssembledDependency] = [
-            await self._assembler.assemble(invocation) for invocation in self._invokables
+            await self._assembler.assemble(invocation) for invocation in self._invocations
         ]
 
         for invocation in assembled_invocations:
@@ -153,6 +158,8 @@ class Engin:
         started.
         """
         self._stop_requested_event.set()
+        if self._shutdown_task is None:
+            return
         await self._stop_complete_event.wait()
 
     async def _shutdown(self) -> None:
@@ -170,12 +177,19 @@ class Engin:
             if isinstance(opt, Block):
                 self._destruct_options(opt)
             if isinstance(opt, Provide | Supply):
-                existing = self._providers.get(opt.return_type_id)
-                self._log_option(opt, overwrites=existing)
-                self._providers[opt.return_type_id] = opt
+                if not opt.is_multiprovider:
+                    existing = self._providers.get(opt.return_type_id)
+                    self._log_option(opt, overwrites=existing)
+                    self._providers[opt.return_type_id] = opt
+                else:
+                    self._log_option(opt)
+                    if opt.return_type_id in self._multiproviders:
+                        self._multiproviders[opt.return_type_id].append(opt)
+                    else:
+                        self._multiproviders[opt.return_type_id] = [opt]
             elif isinstance(opt, Invoke):
                 self._log_option(opt)
-                self._invokables.append(opt)
+                self._invocations.append(opt)
 
     @staticmethod
     def _log_option(opt: Dependency, overwrites: Dependency | None = None) -> None:

{engin-0.0.5.dist-info → engin-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: engin
-Version: 0.0.5
+Version: 0.0.7
 Summary: An async-first modular application framework
 License-File: LICENSE
 Requires-Python: >=3.10

{engin-0.0.5.dist-info → engin-0.0.7.dist-info}/RECORD

@@ -1,8 +1,8 @@
 engin/__init__.py,sha256=yTc8k0HDGMIrxDdEEA90qGD_dExQjVIbXCyaOFRrnMg,508
 engin/_assembler.py,sha256=VCZA_Gq4hnH5LueB_vEVqsKbGXx-nI6KQ65YhzXw-VY,7575
 engin/_block.py,sha256=-5qTp1Hdm3H54nScDGitFpcXRHLIyVHlDYATg_3dnPw,2045
-engin/_dependency.py,sha256=oh1T7oR-c9MGcZ6ZFUgPnvHRf-n6AIvpbm59R97To80,5404
-engin/_engin.py,sha256=kk3U_SZLlGYDbFbPYmErvlRqKE855yPvHBlX6XH2Row,8212
+engin/_dependency.py,sha256=vqBwKNHH_V3MZZQ29A1zWknFSkkzghJgpWN0mjvjtyY,5425
+engin/_engin.py,sha256=lPce5p4fCz2AdBdmXdEFvehryIi4FPmD0zjvDFcL8Jc,8987
 engin/_exceptions.py,sha256=fsc4pTOIGHUh0x7oZhEXPJUTE268sIhswLoiqXaudiw,635
 engin/_lifecycle.py,sha256=_jQnGFj4RYXsxMpcXPJQagFOwnoTVh7oSN8oUYoYuW0,3246
 engin/_type_utils.py,sha256=C71kX2Dr-gluGSL018K4uihX3zkTe7QNWaHhFU10ZmA,2127
@@ -10,7 +10,7 @@ engin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engin/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engin/ext/asgi.py,sha256=6vuC4zIhsvAdmwRn2I6uuUWPYfqobox1dv7skg2OWwE,1940
 engin/ext/fastapi.py,sha256=CH2Zi7Oh_Va0TJGx05e7_LqAiCsoI1qcu0Z59_rgfRk,899
-engin-0.0.5.dist-info/METADATA,sha256=7qu0kb9zWAZWkp0osgHkCqFKBwKykvYUrH4JcbmBY_M,1806
-engin-0.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-engin-0.0.5.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
-engin-0.0.5.dist-info/RECORD,,
+engin-0.0.7.dist-info/METADATA,sha256=mnVPfy7Bdtd_ilWcVn2zHyw1utyepBx3inRlAi3BCHc,1806
+engin-0.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+engin-0.0.7.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
+engin-0.0.7.dist-info/RECORD,,