engin 0.1.0b3__py3-none-any.whl → 0.1.0b5__py3-none-any.whl

engin/_engin.py

@@ -10,7 +10,7 @@ from itertools import chain
 from types import FrameType
 from typing import ClassVar
 
-from anyio import create_task_group, get_cancelled_exc_class
+from anyio import create_task_group, open_signal_receiver
 
 from engin._assembler import AssembledDependency, Assembler
 from engin._dependency import Invoke, Provide, Supply
@@ -149,7 +149,7 @@ class Engin:
             except Exception as err:
                 name = invocation.dependency.name
                 LOG.error(f"invocation '{name}' errored, exiting", exc_info=err)
-                return
+                raise
 
         lifecycle = await self._assembler.build(Lifecycle)
 
@@ -177,10 +177,11 @@ class Engin:
             try:
                 async with supervisor:
                     await self._stop_requested_event.wait()
-            except get_cancelled_exc_class():
-                pass
+                    await self._shutdown()
+            except BaseException:
+                await self._shutdown()
+
             tg.cancel_scope.cancel()
-            await self._shutdown()
 
     async def start(self) -> None:
         """
@@ -188,13 +189,25 @@ class Engin:
         started to return so it is safe to use immediately after.
         """
         self._async_context_run_task = asyncio.create_task(self.run())
+        wait_tasks = [
+            asyncio.create_task(self._start_complete_event.wait()),
+            asyncio.create_task(self._stop_complete_event.wait()),
+        ]
         await asyncio.wait(
             [
-                asyncio.create_task(self._start_complete_event.wait()),
-                asyncio.create_task(self._stop_complete_event.wait()),
+                self._async_context_run_task,  # if a provider errors this will return first
+                *wait_tasks,
             ],
             return_when=asyncio.FIRST_COMPLETED,
         )
+        for task in wait_tasks:
+            task.cancel()
+
+        # raise the exception from the startup during run
+        if self._async_context_run_task.done():
+            startup_exception = self._async_context_run_task.exception()
+            if startup_exception is not None:
+                raise startup_exception
 
     async def stop(self) -> None:
         """
@@ -205,7 +218,8 @@ class Engin:
         started.
         """
         self._stop_requested_event.set()
-        await self._stop_complete_event.wait()
+        if self._state == _EnginState.RUNNING:
+            await self._stop_complete_event.wait()
 
     def graph(self) -> list[Node]:
         """
@@ -224,24 +238,23 @@ class Engin:
         return self._state == _EnginState.SHUTDOWN
 
     async def _shutdown(self) -> None:
-        LOG.info("stopping engin")
-        await self._exit_stack.aclose()
-        self._stop_complete_event.set()
-        LOG.info("shutdown complete")
-        self._state = _EnginState.SHUTDOWN
+        if self._state == _EnginState.RUNNING:
+            LOG.info("stopping engin")
+            await self._exit_stack.aclose()
+            self._stop_complete_event.set()
+            LOG.info("shutdown complete")
+            self._state = _EnginState.SHUTDOWN
 
 
 async def _stop_engin_on_signal(stop_requested_event: Event) -> None:
     """
     A task that waits for a stop signal (SIGINT/SIGTERM) and notifies the given event.
     """
-    # try to gracefully handle sigint/sigterm
     if not _OS_IS_WINDOWS:
-        loop = asyncio.get_running_loop()
-        for signame in (signal.SIGINT, signal.SIGTERM):
-            loop.add_signal_handler(signame, stop_requested_event.set)
-
-        await stop_requested_event.wait()
+        with open_signal_receiver(signal.SIGINT, signal.SIGTERM) as recieved_signals:
+            async for signum in recieved_signals:
+                LOG.debug(f"received {signum.name} signal")
+                stop_requested_event.set()
     else:
         should_stop = False
 

{engin-0.1.0b3.dist-info → engin-0.1.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: engin
-Version: 0.1.0b3
+Version: 0.1.0b5
 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.1.0b3.dist-info → engin-0.1.0b5.dist-info}/RECORD

@@ -2,7 +2,7 @@ engin/__init__.py,sha256=O0vS570kZFBq7Kwy4FgeJFIhfo4aIg5mv_Z_9vAQRio,577
 engin/_assembler.py,sha256=MC14BRsgabGlq9weyv2VXylH4RE282uNTyNH5rN8Lqc,11359
 engin/_block.py,sha256=IacP4PoJKRhSQCbQSdoyCtmu362a4vj6qoUQKyaJwzI,3062
 engin/_dependency.py,sha256=xINk3sudxzsTmkUkNAKQwzBc0G0DfhpnrZli4z3ALBY,9459
-engin/_engin.py,sha256=-zJ3v7T_iRz8sWfQeRSNSrEOEfqUB5eoOGgmFpwIfvQ,8872
+engin/_engin.py,sha256=36trLrhXfKXf1t237qTZb_B3cnE3YvlzHA1c2JQfzN8,9453
 engin/_graph.py,sha256=y1g7Lm_Zy5GPEgRsggCKV5DDaDzcwUl8v3IZCK8jyGI,1631
 engin/_introspect.py,sha256=VdREX6Lhhga5SnEP9G7mjHkgJR4mpqk_SMnmL2zTcqY,966
 engin/_lifecycle.py,sha256=cSWe3euZkmpxmUPFvph2lsTtvuZbxttEfBL-RnOI7lo,5325
@@ -19,8 +19,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.1.0b3.dist-info/METADATA,sha256=LiWfvvBrd60nnSxNlrSCzBhUjQeLr2rn-m6ZwLsavFM,3201
-engin-0.1.0b3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-engin-0.1.0b3.dist-info/entry_points.txt,sha256=sW247zZUMxm0b5UKYvPuqQQljYDtU-j2zK3cu7gHwM0,41
-engin-0.1.0b3.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
-engin-0.1.0b3.dist-info/RECORD,,
+engin-0.1.0b5.dist-info/METADATA,sha256=k-K33xQpJTOGemxOVp0K8MlwKHFArl7LpyBdNKrWeS4,3201
+engin-0.1.0b5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+engin-0.1.0b5.dist-info/entry_points.txt,sha256=sW247zZUMxm0b5UKYvPuqQQljYDtU-j2zK3cu7gHwM0,41
+engin-0.1.0b5.dist-info/licenses/LICENSE,sha256=XHh5LPUPKZWTBqBv2xxN2RU7D59nHoiJGb5RIt8f45w,1070
+engin-0.1.0b5.dist-info/RECORD,,