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

koi_net/context.py

@@ -1,6 +1,6 @@
-
-from koi_net.effector import Effector
 from rid_lib.ext import Cache
+from .config import NodeConfig
+from .effector import Effector
 from .network.graph import NetworkGraph
 from .network.event_queue import NetworkEventQueue
 from .network.request_handler import RequestHandler
@@ -23,6 +23,7 @@ class ActionContext:
 
 class HandlerContext:
     identity: NodeIdentity
+    config: NodeConfig
     cache: Cache
     event_queue: NetworkEventQueue
     graph: NetworkGraph
@@ -33,6 +34,7 @@ class HandlerContext:
     def __init__(
         self,
         identity: NodeIdentity,
+        config: NodeConfig,
         cache: Cache,
         event_queue: NetworkEventQueue,
         graph: NetworkGraph,
@@ -40,6 +42,7 @@ class HandlerContext:
         effector: Effector
     ):
         self.identity = identity
+        self.config = config
         self.cache = cache
         self.event_queue = event_queue
         self.graph = graph

koi_net/core.py

@@ -132,6 +132,7 @@ class NodeInterface(Generic[T]):
         
         self.handler_context = (HandlerContextOverride or HandlerContext)(
             identity=self.identity,
+            config=self.config,
             cache=self.cache,
             event_queue=self.event_queue,
             graph=self.graph,
@@ -173,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/network/event_queue.py

@@ -7,7 +7,7 @@ from rid_lib.ext import Cache
 from rid_lib.types import KoiNetNode
 
 from .graph import NetworkGraph
-from .request_handler import RequestHandler
+from .request_handler import NodeNotFoundError, RequestHandler
 from ..protocol.node import NodeProfile, NodeType
 from ..protocol.edge import EdgeProfile, EdgeType
 from ..protocol.event import Event
@@ -187,11 +187,13 @@ class NetworkEventQueue:
         
         try:  
             self.request_handler.broadcast_events(node, events=events)
-            return True
+
+        except NodeNotFoundError:
+            logger.warning("Broadcast failed (node not found)")
+            
         except httpx.ConnectError:
-            logger.warning("Broadcast failed")
+            logger.warning("Broadcast failed (couldn't connect)")
             
             if requeue_on_fail:
                 for event in events:
-                    self.push_event_to(event, node)
-            return False
+                    self.push_event_to(event, node)

koi_net/network/request_handler.py

@@ -37,6 +37,23 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+# Custom error types for request handling
+class SelfRequestError(Exception):
+    """Raised when a node tries to request itself."""
+    pass
+
+class PartialNodeQueryError(Exception):
+    """Raised when attempting to query a partial node."""
+    pass
+
+class NodeNotFoundError(Exception):
+    """Raised when a node URL cannot be found."""
+    pass
+
+class UnknownPathError(Exception):
+    """Raised when an unknown path is requested."""
+    pass
+
 class RequestHandler:
     """Handles making requests to other KOI nodes."""
     
@@ -65,7 +82,7 @@ class RequestHandler:
         node_url = None
         
         if node_rid == self.identity.rid:
-            raise Exception("Don't talk to yourself")
+            raise SelfRequestError("Don't talk to yourself")
         
         node_bundle = self.effector.deref(node_rid)
                 
@@ -73,7 +90,7 @@ class RequestHandler:
             node_profile = node_bundle.validate_contents(NodeProfile)
             logger.debug(f"Found node profile: {node_profile}")
             if node_profile.node_type != NodeType.FULL:
-                raise Exception("Can't query partial node")
+                raise PartialNodeQueryError("Can't query partial node")
             node_url = node_profile.base_url
         
         else:
@@ -82,7 +99,7 @@ class RequestHandler:
                 node_url = self.identity.config.koi_net.first_contact.url
         
         if not node_url:
-            raise Exception("Node not found")
+            raise NodeNotFoundError("Node not found")
         
         logger.debug(f"Resolved {node_rid!r} to {node_url}")
         return node_url
@@ -124,7 +141,7 @@ class RequestHandler:
         elif path == FETCH_BUNDLES_PATH:
             EnvelopeModel = SignedEnvelope[BundlesPayload]
         else:
-            raise Exception(f"Unknown path '{path}'")
+            raise UnknownPathError(f"Unknown path '{path}'")
         
         resp_envelope = EnvelopeModel.model_validate_json(result.text)
         self.secure.validate_envelope(resp_envelope)

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/processor/default_handlers.py

@@ -233,4 +233,17 @@ def basic_network_output_filter(ctx: HandlerContext, kobj: KnowledgeObject):
         kobj.network_targets.update(subscribers)
         
     return kobj
-            
+
+@KnowledgeHandler.create(HandlerType.Final, rid_types=[KoiNetNode])
+def forget_edge_on_node_deletion(ctx: HandlerContext, kobj: KnowledgeObject):
+    if kobj.normalized_event_type != EventType.FORGET:
+        return
+    
+    for edge_rid in ctx.graph.get_edges():
+        edge_bundle = ctx.cache.read(edge_rid)
+        if not edge_bundle: continue
+        edge_profile = edge_bundle.validate_contents(EdgeProfile)
+        
+        if kobj.rid in (edge_profile.source, edge_profile.target):
+            logger.debug("Identified edge with forgotten node")
+            ctx.handle(rid=edge_rid, event_type=EventType.FORGET)

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.0b3.dist-info → koi_net-1.1.0b5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.1.0b3
+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.0b3.dist-info → koi_net-1.1.0b5.dist-info}/RECORD

@@ -1,24 +1,24 @@
 koi_net/__init__.py,sha256=b0Ze0pZmJAuygpWUFHM6Kvqo3DkU_uzmkptv1EpAArw,31
 koi_net/config.py,sha256=47XbQ59GRYFi4rlsoWKlnzMQATcnK70i3qmKTZAGOQk,4087
-koi_net/context.py,sha256=JmbpCzusXFq_NCXiUp5Z56N6vpBdYMUK8eOs7ogO68A,1428
-koi_net/core.py,sha256=jF3xhIhaKrClutmumHO6MjOlA_L5UNU1BUOsxFuHQAI,7068
+koi_net/context.py,sha256=FwkzjmsyNqUeOeGCuZXtONqs5_MSl1R8-e3IxHuyzTI,1531
+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
-koi_net/network/event_queue.py,sha256=QV1dLOe-H85fNJVkc-e0ZRsUpHTkFcMLMbp3WU5gRNg,7225
+koi_net/network/event_queue.py,sha256=DWs26C235iYkP4koKcdbhmIOHGZRJ48d072BoNWyiHo,7325
 koi_net/network/graph.py,sha256=NLstBsPa9By0luxcTjThnqVd3hxfQdFwn8tWgJ6u4l4,4144
-koi_net/network/request_handler.py,sha256=77SHLO92gVHTusUXWo89KgjRnxU9vLG_Qi8HxTFtFBg,6376
+koi_net/network/request_handler.py,sha256=vBXw2GO5vGAYCs18flWbln4kO_HmY1G9uuFu9MYqedY,6852
 koi_net/network/resolver.py,sha256=coIp4M6k0-8sUfAy4h2NMx_7zCNroWlCHKOj3AXZVhc,5412
 koi_net/network/response_handler.py,sha256=__R_EvEpjaMz3PCDvkNgWF_EAHe2nePGk-zK_cT4C4g,2077
 koi_net/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-koi_net/processor/default_handlers.py,sha256=SX1eP740W9LeG-IEoBOmsNrKJfOEDDuEQUSwnJEG_8w,8954
+koi_net/processor/default_handlers.py,sha256=1OTC4p0luTadNm90q6Fr_dbvysFzgRCbltp-YP6cRXo,9562
 koi_net/processor/handler.py,sha256=_loaHjgVGVUxtCQdvAY9dQ0iqiq5co7wB2tK-usuv3Y,2355
 koi_net/processor/interface.py,sha256=ebDwqggznFRfp2PT8-UJPUAvCwX8nZaaQ68FUeWQvmw,3682
 koi_net/processor/knowledge_object.py,sha256=avQnsaeqqiJxy40P1VGljuQMtAGmJB-TBa4pmBXTaIs,3863
@@ -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.0b3.dist-info/METADATA,sha256=LEE8Js4IHoORcyZ7Hoy6kgggQxwbaYCurbs0AEmnQUs,37118
-koi_net-1.1.0b3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b3.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b3.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,,