koi-net 1.1.0b4__py3-none-any.whl → 1.1.0b5__py3-none-any.whl

koi_net/core.py

@@ -174,6 +174,7 @@ class NodeInterface(Generic[T]):
             processor=self.processor,
             effector=self.effector,
             actor=self.actor,
+            handler_context=self.handler_context,
             use_kobj_processor_thread=use_kobj_processor_thread
         )
         

koi_net/lifecycle.py

@@ -1,4 +1,7 @@
 import logging
+from contextlib import contextmanager, asynccontextmanager
+
+from koi_net.context import HandlerContext
 
 from .network.behavior import Actor
 from .effector import Effector
@@ -25,6 +28,7 @@ class NodeLifecycle:
         processor: ProcessorInterface,
         effector: Effector,
         actor: Actor,
+        handler_context: HandlerContext,
         use_kobj_processor_thread: bool
     ):
         self.config = config
@@ -33,9 +37,34 @@ class NodeLifecycle:
         self.processor = processor
         self.effector = effector
         self.actor = actor
+        self.handler_context = handler_context
         self.use_kobj_processor_thread = use_kobj_processor_thread
+        
+    @contextmanager
+    def run(self):
+        try:
+            logger.info("Starting node lifecycle...")
+            self.start()
+            yield
+        except KeyboardInterrupt:
+            logger.info("Keyboard interrupt!")
+        finally:
+            logger.info("Stopping node lifecycle...")
+            self.stop()
+
+    @asynccontextmanager
+    async def async_run(self):
+        try:
+            logger.info("Starting async node lifecycle...")
+            self.start()
+            yield
+        except KeyboardInterrupt:
+            logger.info("Keyboard interrupt!")
+        finally:
+            logger.info("Stopping async node lifecycle...")
+            self.stop()
     
-    def start(self) -> None:
+    def start(self):
         """Starts a node, call this method first.
         
         Starts the processor thread (if enabled). Loads event queues into memory. Generates network graph from nodes and edges in cache. Processes any state changes of node bundle. Initiates handshake with first contact (if provided) if node doesn't have any neighbors.
@@ -48,7 +77,7 @@ class NodeLifecycle:
         
         # refresh to reflect changes (if any) in config.yaml
         self.effector.deref(self.identity.rid, refresh_cache=True)
-                
+        
         logger.debug("Waiting for kobj queue to empty")
         if self.use_kobj_processor_thread:
             self.processor.kobj_queue.join()
@@ -66,9 +95,7 @@ class NodeLifecycle:
         """Stops a node, call this method last.
         
         Finishes processing knowledge object queue. Saves event queues to storage.
-        """
-        logger.info("Stopping node...")
-        
+        """        
         if self.use_kobj_processor_thread:
             logger.info(f"Waiting for kobj queue to empty ({self.processor.kobj_queue.unfinished_tasks} tasks remaining)")
             self.processor.kobj_queue.join()

koi_net/poller.py

@@ -30,18 +30,11 @@ class NodePoller:
         self.processor.flush_kobj_queue()
 
     def run(self):
-        try:
-            self.lifecycle.start()
+        with self.lifecycle.run():
             while True:
                 start_time = time.time()
                 self.poll()
                 elapsed = time.time() - start_time
                 sleep_time = self.config.koi_net.polling_interval - elapsed
                 if sleep_time > 0:
-                    time.sleep(sleep_time)
-                    
-        except KeyboardInterrupt:
-            logger.info("Polling interrupted by user.")
-            
-        finally:
-            self.lifecycle.stop()
+                    time.sleep(sleep_time)

koi_net/server.py

@@ -54,8 +54,14 @@ class NodeServer:
         self._build_app()
         
     def _build_app(self):
+        
+        @asynccontextmanager
+        async def lifespan(*args, **kwargs):
+            async with self.lifecycle.async_run():
+                yield
+        
         self.app = FastAPI(
-            lifespan=self.lifespan, 
+            lifespan=lifespan, 
             title="KOI-net Protocol API",
             version="1.0.0"
         )
@@ -85,12 +91,6 @@ class NodeServer:
             port=self.config.server.port
         )
         
-    @asynccontextmanager
-    async def lifespan(self, app: FastAPI):
-        self.lifecycle.start()
-        yield
-        self.lifecycle.stop()
-
     def protocol_error_handler(self, request, exc: ProtocolError):
         logger.info(f"caught protocol error: {exc}")
         resp = ErrorResponse(error=exc.error_type)

{koi_net-1.1.0b4.dist-info → koi_net-1.1.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.1.0b4
+Version: 1.1.0b5
 Summary: Implementation of KOI-net protocol in Python
 Project-URL: Homepage, https://github.com/BlockScience/koi-net/
 Author-email: Luke Miller <luke@block.science>

{koi_net-1.1.0b4.dist-info → koi_net-1.1.0b5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 koi_net/__init__.py,sha256=b0Ze0pZmJAuygpWUFHM6Kvqo3DkU_uzmkptv1EpAArw,31
 koi_net/config.py,sha256=47XbQ59GRYFi4rlsoWKlnzMQATcnK70i3qmKTZAGOQk,4087
 koi_net/context.py,sha256=FwkzjmsyNqUeOeGCuZXtONqs5_MSl1R8-e3IxHuyzTI,1531
-koi_net/core.py,sha256=UFERsvnphUCWSQYunMgXlLpJ_XU5yD_1tcqlGO0BV9A,7100
+koi_net/core.py,sha256=aO9caoS8dLafRGheJWzhbp_ym7o7bi_wxds683bly48,7150
 koi_net/default_actions.py,sha256=TkQR9oj9CpO37Gb5bZLmFNl-Q8n3OxGiX4dvxQR7SaA,421
 koi_net/effector.py,sha256=gSyZgRxQ91X04UL261e2pXWUfBHnQTGtjSHpc2JufxA,4097
 koi_net/identity.py,sha256=FvIWksGTqwM7HCevIwmo_6l-t-2tnYkaaR4CanZatL4,569
-koi_net/lifecycle.py,sha256=-J5y4i0JdernatLTed8hQbkK26Cs6rm1kZqlx3aQzZA,2727
-koi_net/poller.py,sha256=ZvQcZ0RQhViXVhbIpdTZb7_ql3nG0mTcdBamneZKLpA,1361
+koi_net/lifecycle.py,sha256=GL2zltmh-aeBuNVg_rbIgsXMch672w7xkWAXCTjxst4,3550
+koi_net/poller.py,sha256=bIrlqdac5vLQYAid35xiQJLDMR85GnOSPCXSTQ07-Mc,1173
 koi_net/secure.py,sha256=cGNF2assqCaYq0i0fhQBm7aREoAdpY-XVypDsE1ALaU,3970
-koi_net/server.py,sha256=5BVVrgn69r_HMC3c4npWywPsjBDqUnHFWLKdtnfRTbA,4250
+koi_net/server.py,sha256=dZfSKrNHqIVD1qc9WkYRO30L4so-A7iW4IsX63oSmlE,4265
 koi_net/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 koi_net/network/behavior.py,sha256=NZLvWlrxR0uWriE3ZzCXmocUVccQthy7Xx8E_8KBwsg,1208
 koi_net/network/error_handler.py,sha256=CrmCpBY2oj4nl7uXrIYusUHDKxPZ1HDuQAtiBSZarRI,1623
@@ -32,7 +32,7 @@ koi_net/protocol/errors.py,sha256=A83QiYe_fJdxW2lsNsLCujWxDr5sk1UmYYd3TGbSNJA,60
 koi_net/protocol/event.py,sha256=eGgihEj1gliLoQRk8pVB2q_was0AGo-PbT3Hqnpn3oU,1379
 koi_net/protocol/node.py,sha256=7GQzHORFr9cP4BqJgir6EGSWCskL-yqmvJksIiLfcWU,409
 koi_net/protocol/secure.py,sha256=Reem9Z4le4uWXM9uczNOdmgVBg8p4YQav-7_c3pZ1CQ,3366
-koi_net-1.1.0b4.dist-info/METADATA,sha256=olgGAhiNBqMAwhtLYCaK0QNNS3s0LuNzHBwazVELAqk,37118
-koi_net-1.1.0b4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b4.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b4.dist-info/RECORD,,
+koi_net-1.1.0b5.dist-info/METADATA,sha256=mEMpi26qrfQMeiULMmoDf3iBUVGb8bvgXhTVa9BqhvU,37118
+koi_net-1.1.0b5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+koi_net-1.1.0b5.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
+koi_net-1.1.0b5.dist-info/RECORD,,