koi-net 1.1.0b6__py3-none-any.whl → 1.1.0b8__py3-none-any.whl

koi_net/actor.py

@@ -0,0 +1,60 @@
+from logging import getLogger
+from rid_lib.types import KoiNetNode
+from rid_lib import RIDType
+from koi_net.context import HandlerContext
+from koi_net.protocol.api_models import ErrorResponse
+from .protocol.event import Event, EventType
+
+
+logger = getLogger(__name__)
+
+
+class Actor:
+    ctx: HandlerContext
+    
+    def __init__(self):
+        pass
+    
+    def set_ctx(self, ctx: HandlerContext):
+        self.ctx = ctx
+    
+    def handshake_with(self, target: KoiNetNode):
+        logger.debug(f"Initiating handshake with {target}")
+        self.ctx.event_queue.push_event_to(
+            Event.from_rid(
+                event_type=EventType.FORGET, 
+                rid=self.ctx.identity.rid),
+            node=target
+        )
+            
+        self.ctx.event_queue.push_event_to(
+            event=Event.from_bundle(
+                event_type=EventType.NEW, 
+                bundle=self.ctx.effector.deref(self.ctx.identity.rid)),
+            node=target
+        )
+        
+        self.ctx.event_queue.flush_webhook_queue(target)
+        
+    def identify_coordinators(self):
+        return self.ctx.resolver.get_state_providers(KoiNetNode)
+        
+    def catch_up_with(self, target: KoiNetNode, rid_types: list[RIDType] = []):
+        logger.debug(f"catching up with {target} on {rid_types or 'all types'}")
+        
+        payload = self.ctx.request_handler.fetch_manifests(
+            node=target,
+            rid_types=rid_types
+        )
+        if type(payload) == ErrorResponse:
+            logger.debug("failed to reach node")
+            return
+        
+        for manifest in payload.manifests:
+            if manifest.rid == self.ctx.identity.rid:
+                continue
+            
+            self.ctx.handle(
+                manifest=manifest,
+                source=target
+            )

koi_net/context.py

@@ -1,4 +1,6 @@
 from rid_lib.ext import Cache
+
+from koi_net.network.resolver import NetworkResolver
 from .config import NodeConfig
 from .effector import Effector
 from .network.graph import NetworkGraph
@@ -28,6 +30,7 @@ class HandlerContext:
     event_queue: NetworkEventQueue
     graph: NetworkGraph
     request_handler: RequestHandler
+    resolver: NetworkResolver
     effector: Effector
     _processor: ProcessorInterface | None
     
@@ -39,6 +42,7 @@ class HandlerContext:
         event_queue: NetworkEventQueue,
         graph: NetworkGraph,
         request_handler: RequestHandler,
+        resolver: NetworkResolver,
         effector: Effector
     ):
         self.identity = identity
@@ -47,6 +51,7 @@ class HandlerContext:
         self.event_queue = event_queue
         self.graph = graph
         self.request_handler = request_handler
+        self.resolver = resolver
         self.effector = effector
         self._processor = None
         

koi_net/core.py

@@ -7,7 +7,7 @@ from .network.graph import NetworkGraph
 from .network.request_handler import RequestHandler
 from .network.response_handler import ResponseHandler
 from .network.error_handler import ErrorHandler
-from .network.behavior import Actor
+from .actor import Actor
 from .processor.interface import ProcessorInterface
 from .processor import default_handlers
 from .processor.handler import KnowledgeHandler
@@ -110,11 +110,7 @@ class NodeInterface(Generic[T]):
             effector=self.effector
         )
         
-        self.actor = (ActorOverride or Actor)(
-            identity=self.identity,
-            effector=self.effector,
-            event_queue=self.event_queue
-        )
+        self.actor = (ActorOverride or Actor)()
         
         # pull all handlers defined in default_handlers module
         if handlers is None:
@@ -137,6 +133,7 @@ class NodeInterface(Generic[T]):
             event_queue=self.event_queue,
             graph=self.graph,
             request_handler=self.request_handler,
+            resolver=self.resolver,
             effector=self.effector
         )
         
@@ -167,6 +164,8 @@ class NodeInterface(Generic[T]):
         self.effector.set_resolver(self.resolver)
         self.effector.set_action_context(self.action_context)
         
+        self.actor.set_ctx(self.handler_context)
+        
         self.lifecycle = (NodeLifecycleOverride or NodeLifecycle)(
             config=self.config,
             identity=self.identity,
@@ -174,7 +173,6 @@ 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,9 +1,9 @@
 import logging
 from contextlib import contextmanager, asynccontextmanager
 
-from koi_net.context import HandlerContext
+from rid_lib.types import KoiNetNode
 
-from .network.behavior import Actor
+from .actor import Actor
 from .effector import Effector
 from .config import NodeConfig
 from .processor.interface import ProcessorInterface
@@ -28,7 +28,6 @@ class NodeLifecycle:
         processor: ProcessorInterface,
         effector: Effector,
         actor: Actor,
-        handler_context: HandlerContext,
         use_kobj_processor_thread: bool
     ):
         self.config = config
@@ -37,7 +36,6 @@ 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
@@ -89,8 +87,11 @@ class NodeLifecycle:
             logger.debug(f"I don't have any neighbors, reaching out to first contact {self.config.koi_net.first_contact.rid!r}")
             
             self.actor.handshake_with(self.config.koi_net.first_contact.rid)
-            
-                        
+        
+        for coordinator in self.actor.identify_coordinators():
+            self.actor.catch_up_with(coordinator, rid_types=[KoiNetNode])
+        
+
     def stop(self):
         """Stops a node, call this method last.
         

koi_net/network/error_handler.py

@@ -3,7 +3,7 @@ from koi_net.protocol.errors import ErrorType
 from koi_net.protocol.event import EventType
 from rid_lib.types import KoiNetNode
 from ..processor.interface import ProcessorInterface
-from ..network.behavior import Actor
+from ..actor import Actor
 
 logger = getLogger(__name__)
 

koi_net/network/graph.py

@@ -57,15 +57,15 @@ class NetworkGraph:
         """Returns edges this node belongs to.
         
         All edges returned by default, specify `direction` to restrict to incoming or outgoing edges only."""
-                
+                        
         edges = []
         if direction != "in" and self.dg.out_edges:
             out_edges = self.dg.out_edges(self.identity.rid)
-            edges.extend([e for e in out_edges])
+            edges.extend(out_edges)
                 
         if direction != "out" and self.dg.in_edges:
             in_edges = self.dg.in_edges(self.identity.rid)
-            edges.extend([e for e in in_edges])
+            edges.extend(in_edges)
                     
         edge_rids = []
         for edge in edges:
@@ -87,7 +87,7 @@ class NetworkGraph:
         
         All neighboring nodes returned by default, specify `direction` to restrict to neighbors connected by incoming or outgoing edges only."""
         
-        neighbors = []
+        neighbors = set()
         for edge_rid in self.get_edges(direction):
             edge_bundle = self.cache.read(edge_rid)
             
@@ -96,7 +96,7 @@ class NetworkGraph:
                 continue
             
             edge_profile = edge_bundle.validate_contents(EdgeProfile)
-            
+                        
             if status and edge_profile.status != status:
                 continue
             
@@ -104,9 +104,9 @@ class NetworkGraph:
                 continue
             
             if edge_profile.target == self.identity.rid:
-                neighbors.append(edge_profile.source)
+                neighbors.add(edge_profile.source)
             elif edge_profile.source == self.identity.rid:
-                neighbors.append(edge_profile.target)
+                neighbors.add(edge_profile.target)
                 
         return list(neighbors)
         

koi_net/network/request_handler.py

@@ -119,7 +119,7 @@ class RequestHandler:
         )
         
         try:
-            result = httpx.post(url, data=signed_envelope.model_dump_json())
+            result = httpx.post(url, data=signed_envelope.model_dump_json(exclude_none=True))
         except httpx.ConnectError as err:
             logger.debug("Failed to connect")
             self.error_handler.handle_connection_error(node)

koi_net/network/resolver.py

@@ -49,7 +49,7 @@ class NetworkResolver:
     def get_state_providers(self, rid_type: RIDType) -> list[KoiNetNode]:
         """Returns list of node RIDs which provide state for the specified RID type."""
         
-        logger.debug(f"Looking for state providers of '{rid_type}'")
+        logger.debug(f"Looking for state providers of {rid_type}")
         provider_nodes = []
         for node_rid in self.cache.list_rids(rid_types=[KoiNetNode]):
             if node_rid == self.identity.rid:

koi_net/protocol/edge.py

@@ -2,6 +2,7 @@ from enum import StrEnum
 from pydantic import BaseModel
 from rid_lib import RIDType
 from rid_lib.ext.bundle import Bundle
+from rid_lib.ext.utils import sha256_hash
 from rid_lib.types import KoiNetEdge, KoiNetNode
 
 
@@ -27,7 +28,9 @@ def generate_edge_bundle(
     rid_types: list[RIDType],
     edge_type: EdgeType
 ) -> Bundle:
-    edge_rid = KoiNetEdge.generate(source, target)
+    edge_rid = KoiNetEdge(sha256_hash(
+        str(source) + str(target)
+    ))
     edge_profile = EdgeProfile(
         source=source,
         target=target,

koi_net/protocol/envelope.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Generic, TypeVar
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from rid_lib.types import KoiNetNode
 
 from .secure import PrivateKey, PublicKey
@@ -13,6 +13,8 @@ logger = logging.getLogger(__name__)
 T = TypeVar("T", bound=RequestModels | ResponseModels)
 
 class SignedEnvelope(BaseModel, Generic[T]):
+    model_config = ConfigDict(exclude_none=True)
+    
     payload: T
     source_node: KoiNetNode
     target_node: KoiNetNode
@@ -26,24 +28,26 @@ class SignedEnvelope(BaseModel, Generic[T]):
             target_node=self.target_node 
         )
         
-        logger.debug(f"Verifying envelope: {unsigned_envelope.model_dump_json()}")
+        logger.debug(f"Verifying envelope: {unsigned_envelope.model_dump_json(exclude_none=True)}")
                 
         pub_key.verify(
             self.signature,
-            unsigned_envelope.model_dump_json().encode()
+            unsigned_envelope.model_dump_json(exclude_none=True).encode()
         )
 
 class UnsignedEnvelope(BaseModel, Generic[T]):
+    model_config = ConfigDict(exclude_none=True)
+    
     payload: T
     source_node: KoiNetNode
     target_node: KoiNetNode
     
     def sign_with(self, priv_key: PrivateKey) -> SignedEnvelope[T]:
-        logger.debug(f"Signing envelope: {self.model_dump_json()}")
+        logger.debug(f"Signing envelope: {self.model_dump_json(exclude_none=True)}")
         logger.debug(f"Type: [{type(self.payload)}]")
         
         signature = priv_key.sign(
-            self.model_dump_json().encode()
+            self.model_dump_json(exclude_none=True).encode()
         )
         
         return SignedEnvelope(

koi_net/protocol/event.py

@@ -15,9 +15,6 @@ class Event(BaseModel):
     manifest: Manifest | None = None
     contents: dict | None = None
     
-    class Config:
-        exclude_none = True
-    
     def __repr__(self):
         return f"<Event '{self.rid}' event type: '{self.event_type}'>"
     

koi_net/server.py

@@ -73,7 +73,8 @@ class NodeServer:
             self.router.add_api_route(
                 path=path,
                 endpoint=self.secure.envelope_handler(func),
-                methods=["POST"]
+                methods=["POST"],
+                response_model_exclude_none=True
             )
         
         _add_endpoint(BROADCAST_EVENTS_PATH, self.broadcast_events)

{koi_net-1.1.0b6.dist-info → koi_net-1.1.0b8.dist-info}/METADATA

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

@@ -1,21 +1,21 @@
 koi_net/__init__.py,sha256=b0Ze0pZmJAuygpWUFHM6Kvqo3DkU_uzmkptv1EpAArw,31
+koi_net/actor.py,sha256=Gad1Xg8n_-zm6sj0nDkm_B1MwErQJKeUsbGmIDTRqJk,1820
 koi_net/config.py,sha256=47XbQ59GRYFi4rlsoWKlnzMQATcnK70i3qmKTZAGOQk,4087
-koi_net/context.py,sha256=FwkzjmsyNqUeOeGCuZXtONqs5_MSl1R8-e3IxHuyzTI,1531
-koi_net/core.py,sha256=aO9caoS8dLafRGheJWzhbp_ym7o7bi_wxds683bly48,7150
+koi_net/context.py,sha256=G067ecIJJ5k8aesdyxjZC_vh3zVg9PR_H2U-09YIxXA,1683
+koi_net/core.py,sha256=6nEDAOkMTv-pynU_hLOG4tKVWhopMPIHyZI6oJTdLj8,7061
 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=GL2zltmh-aeBuNVg_rbIgsXMch672w7xkWAXCTjxst4,3550
+koi_net/lifecycle.py,sha256=1WCo-VOox0rK3v_lfzhnFMGiyacZJpsaENlyGq7jHJQ,3563
 koi_net/poller.py,sha256=bIrlqdac5vLQYAid35xiQJLDMR85GnOSPCXSTQ07-Mc,1173
 koi_net/secure.py,sha256=cGNF2assqCaYq0i0fhQBm7aREoAdpY-XVypDsE1ALaU,3970
-koi_net/server.py,sha256=dZfSKrNHqIVD1qc9WkYRO30L4so-A7iW4IsX63oSmlE,4265
+koi_net/server.py,sha256=PrR_cXQV5YMKa6FXwiJXwMZJ52VQVzLPYYPVl-Miuw8,4315
 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=_dAl2ovpUZEVhPc8_dcLA7I-FoMNqQNwFy0QLa4uTSY,1617
+koi_net/network/error_handler.py,sha256=09ulFPpSzoI49RFYPxc5TLXslqJQ_78q7TzLJIABeMw,1606
 koi_net/network/event_queue.py,sha256=DWs26C235iYkP4koKcdbhmIOHGZRJ48d072BoNWyiHo,7325
-koi_net/network/graph.py,sha256=60SLiR3aNXIOGe-URzMGgx8abmMEJtz37EJs6jeImEM,4143
-koi_net/network/request_handler.py,sha256=vBXw2GO5vGAYCs18flWbln4kO_HmY1G9uuFu9MYqedY,6852
-koi_net/network/resolver.py,sha256=coIp4M6k0-8sUfAy4h2NMx_7zCNroWlCHKOj3AXZVhc,5412
+koi_net/network/graph.py,sha256=neVVVHSyqsQR8hW2-lLC8IkDC2xciBXh3aWYXQpVqZs,4134
+koi_net/network/request_handler.py,sha256=_SM5MuYkS636wGJeFkesapQsW5x_kt_1o9KTXB0wksU,6869
+koi_net/network/resolver.py,sha256=YpQq6HKyfcoqr9TnHRnlQI33IM3tE0ljU02pZ3wWLh8,5410
 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=1OTC4p0luTadNm90q6Fr_dbvysFzgRCbltp-YP6cRXo,9562
@@ -26,13 +26,13 @@ koi_net/processor/knowledge_pipeline.py,sha256=i7FpCFl0UIOwCI5zhP1i8M4PX4A48VN28
 koi_net/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 koi_net/protocol/api_models.py,sha256=jzRZWW_ZB5YsBAiwCom882-WIbr0rPyelJxExRgHZGc,1755
 koi_net/protocol/consts.py,sha256=bisbVEojPIHlLhkLafBzfIhH25TjNfvTORF1g6YXzIM,243
-koi_net/protocol/edge.py,sha256=dQKtI0_eX2E6tD7kMExv6DeJMkqNo2cY-LxJMJbiK0E,963
-koi_net/protocol/envelope.py,sha256=BkBabUZXDOiGJnfBJm5BHTQZflsiQ3jBmG1gNOtmeO4,1698
+koi_net/protocol/edge.py,sha256=PzdEhC43T1KO5iMSEu7I4tiz-7sZxtz41dJfWf-oHA0,1034
+koi_net/protocol/envelope.py,sha256=UVHlO2BDyDiP5eixqx9xD6xUsCfFRi0kZyzC4BC-DOw,1886
 koi_net/protocol/errors.py,sha256=uKPQ-TGLouZuK0xd2pXuCQoRTyu_JFsydSCLml13Cz8,595
-koi_net/protocol/event.py,sha256=eGgihEj1gliLoQRk8pVB2q_was0AGo-PbT3Hqnpn3oU,1379
+koi_net/protocol/event.py,sha256=HxzLN-iCXPyr2YzrswMIkgZYeUdFbBpa5v98dAB06lQ,1328
 koi_net/protocol/node.py,sha256=7GQzHORFr9cP4BqJgir6EGSWCskL-yqmvJksIiLfcWU,409
 koi_net/protocol/secure.py,sha256=6sRLWxG5EDF0QLBj29gk3hPmZnPXATrTTFdwx39wQfY,5127
-koi_net-1.1.0b6.dist-info/METADATA,sha256=G2VwaYEW0oLstoINlbOJlT-f2yAhSXEOZP3shspdgqo,37118
-koi_net-1.1.0b6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b6.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b6.dist-info/RECORD,,
+koi_net-1.1.0b8.dist-info/METADATA,sha256=Kcb1WYE-Eu04rmqyapoF_D_BzfO7q3Q8rSd_dLnXQcY,37118
+koi_net-1.1.0b8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+koi_net-1.1.0b8.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
+koi_net-1.1.0b8.dist-info/RECORD,,

koi_net/network/behavior.py

@@ -1,42 +0,0 @@
-from logging import getLogger
-from rid_lib.types import KoiNetNode
-from ..protocol.event import Event, EventType
-from ..identity import NodeIdentity
-from ..effector import Effector
-from ..network.event_queue import NetworkEventQueue
-
-logger = getLogger(__name__)
-
-
-class Actor:
-    identity: NodeIdentity
-    effector: Effector
-    event_queue: NetworkEventQueue
-    
-    def __init__(
-        self, 
-        identity: NodeIdentity, 
-        effector: Effector,
-        event_queue: NetworkEventQueue
-    ):
-        self.identity = identity
-        self.effector = effector
-        self.event_queue = event_queue
-    
-    def handshake_with(self, target: KoiNetNode):
-        logger.debug(f"Initiating handshake with {target}")
-        self.event_queue.push_event_to(
-            Event.from_rid(
-                event_type=EventType.FORGET, 
-                rid=self.identity.rid),
-            node=target
-        )
-            
-        self.event_queue.push_event_to(
-            event=Event.from_bundle(
-                event_type=EventType.NEW, 
-                bundle=self.effector.deref(self.identity.rid)),
-            node=target
-        )
-        
-        self.event_queue.flush_webhook_queue(target)