engin 0.1a1__py3-none-any.whl → 0.1.0a2__py3-none-any.whl

engin/_engin.py

@@ -5,6 +5,7 @@ import signal
 from asyncio import Event, Task
 from collections import defaultdict
 from contextlib import AsyncExitStack
+from enum import Enum
 from itertools import chain
 from types import FrameType
 from typing import ClassVar
@@ -19,11 +20,39 @@ from engin._option import Option
 from engin._shutdown import ShutdownSwitch
 from engin._supervisor import Supervisor
 from engin._type_utils import TypeId
+from engin.exceptions import EnginError
 
 _OS_IS_WINDOWS = os.name == "nt"
 LOG = logging.getLogger("engin")
 
 
+class _EnginState(Enum):
+    IDLE = 0
+    """
+    Not yet started.
+    """
+
+    STARTED = 1
+    """
+    Engin started via .start() call
+    """
+
+    RUNNING = 2
+    """
+    Engin running via .run() call
+    """
+
+    STOPPING = 3
+    """
+    Engin stopped via .stop() call
+    """
+
+    SHUTDOWN = 4
+    """
+    Engin has performed shutdown
+    """
+
+
 class Engin:
     """
     The Engin is a modular application defined by a collection of options.
@@ -83,6 +112,7 @@ class Engin:
         Args:
             *options: an instance of Provide, Supply, Invoke, Entrypoint or a Block.
         """
+        self._state = _EnginState.IDLE
         self._stop_requested_event = ShutdownSwitch()
         self._stop_complete_event = Event()
         self._exit_stack: AsyncExitStack = AsyncExitStack()
@@ -118,8 +148,13 @@ class Engin:
         SIGINT), the `stop` method is called on the engin, or a lifecycle task errors.
         """
         await self.start()
-        if self._shutdown_task:
-            self._shutdown_task.cancel("redundant")
+
+        # engin failed to start, so exit early
+        if self._state != _EnginState.STARTED:
+            return
+
+        self._state = _EnginState.RUNNING
+
         async with create_task_group() as tg:
             tg.start_soon(_stop_engin_on_signal, self._stop_requested_event)
             try:
@@ -137,6 +172,9 @@ class Engin:
         lifecycle to complete and then returns. The caller is then responsible for
         calling `stop`.
         """
+        if self._state != _EnginState.IDLE:
+            raise EnginError("Engin is not idle, unable to start")
+
         LOG.info("starting engin")
         assembled_invocations: list[AssembledDependency] = [
             await self._assembler.assemble(invocation) for invocation in self._invocations
@@ -169,8 +207,7 @@ class Engin:
             return
 
         LOG.info("startup complete")
-
-        self._shutdown_task = asyncio.create_task(self._shutdown_when_stopped())
+        self._state = _EnginState.STARTED
 
     async def stop(self) -> None:
         """
@@ -180,10 +217,13 @@ class Engin:
         Note this method can be safely called at any point, even before the engin is
         started.
         """
-        self._stop_requested_event.set()
-        if self._shutdown_task is None:
-            return
-        await self._stop_complete_event.wait()
+        # If the Engin was ran via `start()` perform shutdown directly
+        if self._state == _EnginState.STARTED:
+            await self._shutdown()
+        # If the Engin was ran via `run()` notify via event
+        elif self._state == _EnginState.RUNNING:
+            self._stop_requested_event.set()
+            await self._stop_complete_event.wait()
 
     def graph(self) -> list[Node]:
         grapher = DependencyGrapher({**self._providers, **self._multiproviders})
@@ -194,10 +234,7 @@ class Engin:
         await self._exit_stack.aclose()
         self._stop_complete_event.set()
         LOG.info("shutdown complete")
-
-    async def _shutdown_when_stopped(self) -> None:
-        await self._stop_requested_event.wait()
-        await self._shutdown()
+        self._state = _EnginState.SHUTDOWN
 
 
 async def _stop_engin_on_signal(stop_requested_event: Event) -> None:

{engin-0.1a1.dist-info → engin-0.1.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: engin
-Version: 0.1a1
+Version: 0.1.0a2
 Summary: An async-first modular application framework
 Project-URL: Homepage, https://github.com/invokermain/engin
 Project-URL: Documentation, https://engin.readthedocs.io/en/latest/
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 
 # Engin 🏎️
 
-Engin is a zero-dependency application framework for modern Python.
+Engin is a lightweight application framework for modern Python.
 
 **Documentation**: https://engin.readthedocs.io/
 

{engin-0.1a1.dist-info → engin-0.1.0a2.dist-info}/RECORD

@@ -2,7 +2,7 @@ engin/__init__.py,sha256=v5OWwQoxTtqh2sB2E5iSMg3gATJoXKOuJLq28aZX6C8,642
 engin/_assembler.py,sha256=-ENSrXPMWacionIYrTSQO7th9DDBOPyAT8ybPbBRtQw,11318
 engin/_block.py,sha256=IacP4PoJKRhSQCbQSdoyCtmu362a4vj6qoUQKyaJwzI,3062
 engin/_dependency.py,sha256=xINk3sudxzsTmkUkNAKQwzBc0G0DfhpnrZli4z3ALBY,9459
-engin/_engin.py,sha256=UGS-dIMGcdhRWvsQBuwIH6I7XFxYMlgSZeuvl3ur3Eo,8417
+engin/_engin.py,sha256=XkGUG3D7z8X31rZhbu02_NFhFwSKB4JPSoma5jv6nq4,9135
 engin/_graph.py,sha256=y1g7Lm_Zy5GPEgRsggCKV5DDaDzcwUl8v3IZCK8jyGI,1631
 engin/_introspect.py,sha256=VdREX6Lhhga5SnEP9G7mjHkgJR4mpqk_SMnmL2zTcqY,966
 engin/_lifecycle.py,sha256=cSWe3euZkmpxmUPFvph2lsTtvuZbxttEfBL-RnOI7lo,5325
@@ -20,8 +20,8 @@ engin/_cli/_inspect.py,sha256=0jm25d4wcbXVNJkyaeECSKY-irsxd-EIYBH1GDW_Yjc,3163
 engin/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 engin/extensions/asgi.py,sha256=d5Z6gtMVWDZdAlvrTaMt987sKyiq__A0X4gJQ7IETmA,3247
 engin/extensions/fastapi.py,sha256=7N6i-eZUEZRPo7kcvjS7kbRSY5QAPyKJXSeongSQ-OA,6371
-engin-0.1a1.dist-info/METADATA,sha256=f5atVNZHxnofJLnnf2upFC_MYjAJv3lVkQIxe62z1TA,2410
-engin-0.1a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-engin-0.1a1.dist-info/entry_points.txt,sha256=sW247zZUMxm0b5UKYvPuqQQljYDtU-j2zK3cu7gHwM0,41
-engin-0.1a1.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
-engin-0.1a1.dist-info/RECORD,,
+engin-0.1.0a2.dist-info/METADATA,sha256=eg-rPpaGOV1MDNenGqSGCldPlTHh2yZ3CcZ0b5agakc,2408
+engin-0.1.0a2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+engin-0.1.0a2.dist-info/entry_points.txt,sha256=sW247zZUMxm0b5UKYvPuqQQljYDtU-j2zK3cu7gHwM0,41
+engin-0.1.0a2.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
+engin-0.1.0a2.dist-info/RECORD,,