koi-net 1.1.0b2__py3-none-any.whl → 1.1.0b4__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

@@ -1,5 +1,5 @@
 import logging
-from koi_net.protocol.node import NodeType
+from typing import Generic, TypeVar
 from rid_lib.ext import Cache
 from .network.resolver import NetworkResolver
 from .network.event_queue import NetworkEventQueue
@@ -25,9 +25,10 @@ from . import default_actions
 logger = logging.getLogger(__name__)
 
 
+T = TypeVar("T", bound=NodeConfig)
 
-class NodeInterface:
-    config: NodeConfig
+class NodeInterface(Generic[T]):
+    config: T
     cache: Cache
     identity: NodeIdentity
     resolver: NetworkResolver
@@ -41,58 +42,75 @@ class NodeInterface:
     
     def __init__(
         self,
-        config: NodeConfig,
+        config: T,
         use_kobj_processor_thread: bool = False,
         handlers: list[KnowledgeHandler] | None = None,
-        cache: Cache | None = None,
-        processor: ProcessorInterface | None = None
+        
+        CacheOverride: type[Cache] | None = None,
+        NodeIdentityOverride: type[NodeIdentity] | None = None,
+        EffectorOverride: type[Effector] | None = None,
+        NetworkGraphOverride: type[NetworkGraph] | None = None,
+        SecureOverride: type[Secure] | None = None,
+        RequestHandlerOverride: type[RequestHandler] | None = None,
+        ResponseHandlerOverride: type[ResponseHandler] | None = None,
+        NetworkResolverOverride: type[NetworkResolver] | None = None,
+        NetworkEventQueueOverride: type[NetworkEventQueue] | None = None,
+        ActorOverride: type[Actor] | None = None,
+        ActionContextOverride: type[ActionContext] | None = None,
+        HandlerContextOverride: type[HandlerContext] | None = None,
+        KnowledgePipelineOverride: type[KnowledgePipeline] | None = None,
+        ProcessorInterfaceOverride: type[ProcessorInterface] | None = None,
+        ErrorHandlerOverride: type[ErrorHandler] | None = None,
+        NodeLifecycleOverride: type[NodeLifecycle] | None = None,
+        NodeServerOverride: type[NodeServer] | None = None,
+        NodePollerOverride: type[NodePoller] | None = None,        
     ):
         self.config = config
-        self.cache = cache or Cache(
+        self.cache = (CacheOverride or Cache)(
             directory_path=self.config.koi_net.cache_directory_path
         )
 
-        self.identity = NodeIdentity(config=self.config)
-        self.effector = Effector(cache=self.cache)
+        self.identity = (NodeIdentityOverride or NodeIdentity)(config=self.config)
+        self.effector = (EffectorOverride or Effector)(cache=self.cache)
 
-        self.graph = NetworkGraph(
-            cache=self.cache, 
+        self.graph = (NetworkGraphOverride or NetworkGraph)(
+            cache=self.cache,
             identity=self.identity
         )
-        
-        self.secure = Secure(
-            identity=self.identity, 
-            effector=self.effector, 
+
+        self.secure = (SecureOverride or Secure)(
+            identity=self.identity,
+            effector=self.effector,
             config=self.config
         )
-        
-        self.request_handler = RequestHandler(
-            effector=self.effector, 
+
+        self.request_handler = (RequestHandlerOverride or RequestHandler)(
+            effector=self.effector,
             identity=self.identity,
             secure=self.secure
         )
-        
-        self.response_handler = ResponseHandler(self.cache, self.effector)
-        
-        self.resolver = NetworkResolver(
+
+        self.response_handler = (ResponseHandlerOverride or ResponseHandler)(self.cache, self.effector)
+
+        self.resolver = (NetworkResolverOverride or NetworkResolver)(
             config=self.config,
-            cache=self.cache, 
+            cache=self.cache,
             identity=self.identity,
             graph=self.graph,
             request_handler=self.request_handler,
             effector=self.effector
         )
-        
-        self.event_queue = NetworkEventQueue(
+
+        self.event_queue = (NetworkEventQueueOverride or NetworkEventQueue)(
             config=self.config,
-            cache=self.cache, 
+            cache=self.cache,
             identity=self.identity,
             graph=self.graph,
             request_handler=self.request_handler,
             effector=self.effector
         )
         
-        self.actor = Actor(
+        self.actor = (ActorOverride or Actor)(
             identity=self.identity,
             effector=self.effector,
             event_queue=self.event_queue
@@ -107,13 +125,14 @@ class NodeInterface:
 
         self.use_kobj_processor_thread = use_kobj_processor_thread
         
-        self.action_context = ActionContext(
+        self.action_context = (ActionContextOverride or ActionContext)(
             identity=self.identity,
             effector=self.effector
         )
         
-        self.handler_context = HandlerContext(
+        self.handler_context = (HandlerContextOverride or HandlerContext)(
             identity=self.identity,
+            config=self.config,
             cache=self.cache,
             event_queue=self.event_queue,
             graph=self.graph,
@@ -121,7 +140,7 @@ class NodeInterface:
             effector=self.effector
         )
         
-        self.pipeline = KnowledgePipeline(
+        self.pipeline = (KnowledgePipelineOverride or KnowledgePipeline)(
             handler_context=self.handler_context,
             cache=self.cache,
             request_handler=self.request_handler,
@@ -130,12 +149,12 @@ class NodeInterface:
             default_handlers=handlers
         )
         
-        self.processor = processor or ProcessorInterface(
+        self.processor = (ProcessorInterfaceOverride or ProcessorInterface)(
             pipeline=self.pipeline,
             use_kobj_processor_thread=self.use_kobj_processor_thread
         )
         
-        self.error_handler = ErrorHandler(
+        self.error_handler = (ErrorHandlerOverride or ErrorHandler)(
             processor=self.processor,
             actor=self.actor
         )
@@ -148,7 +167,7 @@ class NodeInterface:
         self.effector.set_resolver(self.resolver)
         self.effector.set_action_context(self.action_context)
         
-        self.lifecycle = NodeLifecycle(
+        self.lifecycle = (NodeLifecycleOverride or NodeLifecycle)(
             config=self.config,
             identity=self.identity,
             graph=self.graph,
@@ -159,7 +178,7 @@ class NodeInterface:
         )
         
         # if self.config.koi_net.node_profile.node_type == NodeType.FULL:
-        self.server = NodeServer(
+        self.server = (NodeServerOverride or NodeServer)(
             config=self.config,
             lifecycle=self.lifecycle,
             secure=self.secure,
@@ -168,7 +187,7 @@ class NodeInterface:
             response_handler=self.response_handler
         )
         
-        self.poller = NodePoller(
+        self.poller = (NodePollerOverride or NodePoller)(
             processor=self.processor,
             lifecycle=self.lifecycle,
             resolver=self.resolver,

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/network/response_handler.py

@@ -1,5 +1,6 @@
 import logging
 from rid_lib import RID
+from rid_lib.types import KoiNetNode
 from rid_lib.ext import Manifest, Cache
 from rid_lib.ext.bundle import Bundle
 
@@ -30,13 +31,13 @@ class ResponseHandler:
         self.cache = cache
         self.effector = effector
         
-    def fetch_rids(self, req: FetchRids) -> RidsPayload:
+    def fetch_rids(self, req: FetchRids, source: KoiNetNode) -> RidsPayload:
         logger.info(f"Request to fetch rids, allowed types {req.rid_types}")
         rids = self.cache.list_rids(req.rid_types)
         
         return RidsPayload(rids=rids)
         
-    def fetch_manifests(self, req: FetchManifests) -> ManifestsPayload:
+    def fetch_manifests(self, req: FetchManifests, source: KoiNetNode) -> ManifestsPayload:
         logger.info(f"Request to fetch manifests, allowed types {req.rid_types}, rids {req.rids}")
         
         manifests: list[Manifest] = []
@@ -51,7 +52,7 @@ class ResponseHandler:
         
         return ManifestsPayload(manifests=manifests, not_found=not_found)
         
-    def fetch_bundles(self, req: FetchBundles) -> BundlesPayload:
+    def fetch_bundles(self, req: FetchBundles, source: KoiNetNode) -> BundlesPayload:
         logger.info(f"Request to fetch bundles, requested rids {req.rids}")
         
         bundles: list[Bundle] = []

koi_net/poller.py

@@ -22,17 +22,19 @@ class NodePoller:
         self.resolver = resolver
         self.config = config
 
+    def poll(self):
+        neighbors = self.resolver.poll_neighbors()
+        for node_rid in neighbors:
+            for event in neighbors[node_rid]:
+                self.processor.handle(event=event, source=node_rid)
+        self.processor.flush_kobj_queue()
+
     def run(self):
         try:
             self.lifecycle.start()
             while True:
                 start_time = time.time()
-                neighbors = self.resolver.poll_neighbors()
-                for node_rid in neighbors:
-                    for event in neighbors[node_rid]:
-                        self.processor.handle(event=event, source=node_rid)
-                self.processor.flush_kobj_queue()
-                
+                self.poll()
                 elapsed = time.time() - start_time
                 sleep_time = self.config.koi_net.polling_interval - elapsed
                 if sleep_time > 0:

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

@@ -109,20 +109,20 @@ class NodeServer:
         self, req: SignedEnvelope[PollEvents]
     ) -> SignedEnvelope[EventsPayload] | ErrorResponse:
         logger.info(f"Request to {POLL_EVENTS_PATH}")
-        events = self.event_queue.flush_poll_queue(req.payload.rid)
+        events = self.event_queue.flush_poll_queue(req.source_node)
         return EventsPayload(events=events)
 
     async def fetch_rids(
         self, req: SignedEnvelope[FetchRids]
     ) -> SignedEnvelope[RidsPayload] | ErrorResponse:
-        return self.response_handler.fetch_rids(req.payload)
+        return self.response_handler.fetch_rids(req.payload, req.source_node)
 
     async def fetch_manifests(
         self, req: SignedEnvelope[FetchManifests]
     ) -> SignedEnvelope[ManifestsPayload] | ErrorResponse:
-        return self.response_handler.fetch_manifests(req.payload)
+        return self.response_handler.fetch_manifests(req.payload, req.source_node)
 
     async def fetch_bundles(
         self, req: SignedEnvelope[FetchBundles]
     ) -> SignedEnvelope[BundlesPayload] | ErrorResponse:
-        return self.response_handler.fetch_bundles(req.payload)
+        return self.response_handler.fetch_bundles(req.payload, req.source_node)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.1.0b2
+Version: 1.1.0b4
 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.0b2.dist-info → koi_net-1.1.0b4.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=wJjEaza-Q_QqTZL8xOWdlMkjOhCmX8Lj3uBy2GUGDF0,5565
+koi_net/context.py,sha256=FwkzjmsyNqUeOeGCuZXtONqs5_MSl1R8-e3IxHuyzTI,1531
+koi_net/core.py,sha256=UFERsvnphUCWSQYunMgXlLpJ_XU5yD_1tcqlGO0BV9A,7100
 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=tlqbDMTdkU8vCbi95rOBeHUEWLkrECKW3gnF9MYhKQw,1369
+koi_net/poller.py,sha256=ZvQcZ0RQhViXVhbIpdTZb7_ql3nG0mTcdBamneZKLpA,1361
 koi_net/secure.py,sha256=cGNF2assqCaYq0i0fhQBm7aREoAdpY-XVypDsE1ALaU,3970
-koi_net/server.py,sha256=ONJMhC_9VNBTVTdHRMP66T9QIZ1UuSZY7C_KoRcVb9k,4199
+koi_net/server.py,sha256=5BVVrgn69r_HMC3c4npWywPsjBDqUnHFWLKdtnfRTbA,4250
 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=tEfzSZWXKCRwUlXhM8Qp3Y6BKTQ4abfi-MrSaatlITI,1980
+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.0b2.dist-info/METADATA,sha256=k341N2GlyWwem7ojdmX1PH8tij0D4CQHfOjGnuv5XYQ,37118
-koi_net-1.1.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b2.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b2.dist-info/RECORD,,
+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,,