engin 0.0.5__tar.gz → 0.0.6__tar.gz

{engin-0.0.5 → engin-0.0.6}/CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [0.0.6] - 2025-02-19
+
+### Fixed
+
+- Engin now respects intended multiproviders behaviour instead of treating them as normal
+  providers and overwriting existing multiproviders for that type.
+- `Engin.shutdown()` does not block if shutdown is called before startup, or after aborted
+  startup.
+
+
 ## [0.0.5] - 2025-01-29
 
 ### Added

{engin-0.0.5 → engin-0.0.6}/PKG-INFO

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

{engin-0.0.5 → engin-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "engin"
-version = "0.0.5"
+version = "0.0.6"
 description = "An async-first modular application framework"
 readme = "README.md"
 requires-python = ">=3.10"

{engin-0.0.5 → engin-0.0.6}/src/engin/_engin.py

@@ -81,8 +81,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 +88,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 +125,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 +159,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 +178,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 → engin-0.0.6}/tests/test_engin.py

@@ -31,10 +31,19 @@ async def test_engin():
     def c(_: B) -> C:
         return C()
 
-    def main(c: C) -> None:
+    def multi_a() -> list[A]:
+        return [A()]
+
+    def multi_a_2() -> list[A]:
+        return [A(), A()]
+
+    def main(c: C, multi_a: list[A]) -> None:
         assert isinstance(c, C)
+        assert len(multi_a) == 3
 
-    engin = Engin(Provide(a), Provide(b), Provide(c), Invoke(main))
+    engin = Engin(
+        Provide(a), Provide(b), Provide(c), Provide(multi_a), Provide(multi_a_2), Invoke(main)
+    )
 
     await engin.start()
     await engin.stop()