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

koi_net/core.py

@@ -11,25 +11,30 @@ from .protocol.event import Event, EventType
 
 logger = logging.getLogger(__name__)
 
+
 class NodeInterface:
     cache: Cache
     identity: NodeIdentity
     network: NetworkInterface
     processor: ProcessorInterface
     first_contact: str
+    use_kobj_processor_thread: bool
     
     def __init__(
         self, 
         name: str,
         profile: NodeProfile,
         identity_file_path: str = "identity.json",
+        event_queues_file_path: str = "event_queues.json",
+        cache_directory_path: str = "rid_cache",
+        use_kobj_processor_thread: bool = False,
         first_contact: str | None = None,
         handlers: list[KnowledgeHandler] | None = None,
         cache: Cache | None = None,
         network: NetworkInterface | None = None,
         processor: ProcessorInterface | None = None
     ):
-        self.cache = cache or Cache(directory_path=f".cache")
+        self.cache = cache or Cache(cache_directory_path)
         self.identity = NodeIdentity(
             name=name,
             profile=profile,
@@ -38,7 +43,7 @@ class NodeInterface:
         )
         self.first_contact = first_contact
         self.network = network or NetworkInterface(
-            file_path="event_queues.json", 
+            file_path=event_queues_file_path, 
             first_contact=self.first_contact,
             cache=self.cache, 
             identity=self.identity
@@ -50,30 +55,41 @@ class NodeInterface:
                 obj for obj in vars(default_handlers).values() 
                 if isinstance(obj, KnowledgeHandler)
             ]
-        
+
+        self.use_kobj_processor_thread = use_kobj_processor_thread
         self.processor = processor or ProcessorInterface(
             cache=self.cache, 
             network=self.network, 
             identity=self.identity, 
+            use_kobj_processor_thread=self.use_kobj_processor_thread,
             default_handlers=handlers
         )
     
-    def initialize(self) -> None:
-        """Initializes node, call on startup.
+    def start(self) -> None:
+        """Starts a node, call this method first.
         
-        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.
+        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.
         """
-        self.network._load_event_queues()
+        if self.use_kobj_processor_thread:
+            logger.info("Starting processor worker thread")
+            self.processor.worker_thread.start()
         
+        self.network._load_event_queues()
         self.network.graph.generate()
         
         self.processor.handle(
             bundle=Bundle.generate(
                 rid=self.identity.rid, 
                 contents=self.identity.profile.model_dump()
-            ),
-            flush=True
+            )
         )
+        
+        logger.info("Waiting for kobj queue to empty")
+        if self.use_kobj_processor_thread:
+            self.processor.kobj_queue.join()
+        else:
+            self.processor.flush_kobj_queue()
+        logger.info("Done")
     
         if not self.network.graph.get_neighbors() and self.first_contact:
             logger.info(f"I don't have any neighbors, reaching out to first contact {self.first_contact}")
@@ -94,9 +110,17 @@ class NodeInterface:
                 return
             
                         
-    def finalize(self):
-        """Finalizes node, call on shutdown.
+    def stop(self):
+        """Stops a node, call this method last.
         
-        Saves event queues to storage.
+        Finishes processing knowledge object queue. Saves event queues to storage.
         """
+        logger.info("Stopping node...")
+        
+        if self.use_kobj_processor_thread:
+            logger.info("Waiting for kobj queue to empty")
+            self.processor.kobj_queue.join()
+        else:
+            self.processor.flush_kobj_queue()
+        
         self.network._save_event_queues()

koi_net/network/graph.py

@@ -74,13 +74,13 @@ 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":
+        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])
                 
-        if direction != "out":
+        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])
                     

koi_net/network/interface.py

@@ -165,6 +165,8 @@ class NetworkInterface:
             return
         
         events = self._flush_queue(self.webhook_event_queue, node)
+        if not events: return
+        
         logger.info(f"Broadcasting {len(events)} events")
         
         try:  
@@ -173,11 +175,6 @@ class NetworkInterface:
             logger.warning("Broadcast failed, requeuing events")
             for event in events:
                 self.push_event_to(event, node)
-    
-    def flush_all_webhook_queues(self):
-        """Flushes all nodes' webhook queues and broadcasts events."""
-        for node in self.webhook_event_queue.keys():
-            self.flush_webhook_queue(node)
             
     def get_state_providers(self, rid_type: RIDType) -> list[KoiNetNode]:
         """Returns list of node RIDs which provide state for the specified RID type."""
@@ -204,8 +201,8 @@ class NetworkInterface:
             payload = self.request_handler.fetch_bundles(
                 node=node_rid, rids=[rid])
             
-            if payload.manifests:
-                remote_bundle = payload.manifests[0]
+            if payload.bundles:
+                remote_bundle = payload.bundles[0]
                 logger.info(f"Got bundle from '{node_rid}'")
                 break
         

koi_net/network/response_handler.py

@@ -56,4 +56,4 @@ class ResponseHandler:
             else:
                 not_found.append(rid)
             
-        return BundlesPayload(manifests=bundles, not_found=not_found)
+        return BundlesPayload(bundles=bundles, not_found=not_found)

koi_net/processor/interface.py

@@ -1,5 +1,6 @@
 import logging
-from queue import Queue
+import queue
+import threading
 from typing import Callable
 from rid_lib.core import RID, RIDType
 from rid_lib.ext import Bundle, Cache, Manifest
@@ -30,20 +31,30 @@ class ProcessorInterface:
     network: NetworkInterface
     identity: NodeIdentity
     handlers: list[KnowledgeHandler]
-    kobj_queue: Queue[KnowledgeObject]
+    kobj_queue: queue.Queue[KnowledgeObject]
+    use_kobj_processor_thread: bool
+    worker_thread: threading.Thread | None = None
     
     def __init__(
         self, 
         cache: Cache, 
         network: NetworkInterface,
         identity: NodeIdentity,
+        use_kobj_processor_thread: bool,
         default_handlers: list[KnowledgeHandler] = []
     ):
         self.cache = cache
         self.network = network
         self.identity = identity
+        self.use_kobj_processor_thread = use_kobj_processor_thread
         self.handlers: list[KnowledgeHandler] = default_handlers
-        self.kobj_queue = Queue()
+        self.kobj_queue = queue.Queue()
+        
+        if self.use_kobj_processor_thread:
+            self.worker_thread = threading.Thread(
+                target=self.kobj_processor_worker,
+                daemon=True
+            )
         
     def add_handler(self, handler: KnowledgeHandler):
         self.handlers.append(handler)
@@ -195,18 +206,38 @@ class ProcessorInterface:
             logger.info("No network targets set")
         
         for node in kobj.network_targets:
-            self.network.push_event_to(kobj.normalized_event, node)
-        self.network.flush_all_webhook_queues()
+            self.network.push_event_to(kobj.normalized_event, node, flush=True)
         
         kobj = self.call_handler_chain(HandlerType.Final, kobj)
-                
+
     def flush_kobj_queue(self):
-        """Flushes all knowledge objects from queue and processes them."""
+        """Flushes all knowledge objects from queue and processes them.
+        
+        NOTE: ONLY CALL THIS METHOD IN SINGLE THREADED NODES, OTHERWISE THIS WILL CAUSE RACE CONDITIONS.
+        """
+        if self.use_kobj_processor_thread:
+            logger.warning("You are using a worker thread, calling this method can cause race conditions!")
+        
         while not self.kobj_queue.empty():
             kobj = self.kobj_queue.get()
             logger.info(f"Dequeued {kobj!r}")
             self.process_kobj(kobj)
+            self.kobj_queue.task_done()
             logger.info("Done handling")
+    
+    def kobj_processor_worker(self, timeout=0.1):
+        while True:
+            try:
+                kobj = self.kobj_queue.get(timeout=timeout)
+                logger.info(f"Dequeued {kobj!r}")
+                self.process_kobj(kobj)
+                self.kobj_queue.task_done()
+            
+            except queue.Empty:
+                pass
+            
+            except Exception as e:
+                logger.warning(f"Error processing kobj: {e}")
         
     def handle(
         self,
@@ -216,8 +247,7 @@ class ProcessorInterface:
         event: Event | None = None,
         kobj: KnowledgeObject | None = None,
         event_type: KnowledgeEventType = None,
-        source: KnowledgeSource = KnowledgeSource.Internal,
-        flush: bool = False
+        source: KnowledgeSource = KnowledgeSource.Internal
     ):
         """Queues provided knowledge to be handled by processing pipeline.
         
@@ -238,6 +268,3 @@ class ProcessorInterface:
         
         self.kobj_queue.put(_kobj)
         logger.info(f"Queued {_kobj!r}")
-        
-        if flush:
-            self.flush_kobj_queue()

koi_net/protocol/api_models.py

@@ -33,7 +33,7 @@ class ManifestsPayload(BaseModel):
     not_found: list[RID] = []
     
 class BundlesPayload(BaseModel):
-    manifests: list[Bundle]
+    bundles: list[Bundle]
     not_found: list[RID] = []
     deferred: list[RID] = []
     

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.0.0b6
+Version: 1.0.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>
@@ -144,13 +144,14 @@ node = NodeInterface(
             event=[],
             state=[]
         )
-    )
+    ),
+    use_kobj_processor_thread=True
 )
 ```
 
 ## Knowledge Processing
 
-Next we'll set up the knowledge processing flow for our node. This is where most of the node's logic and behavior will come into play. For partial nodes this will be an event loop, and for full nodes we will use webhooks. Make sure to call `node.initialize()` and `node.finalize()` at the beginning and end of your node's life cycle.
+Next we'll set up the knowledge processing flow for our node. This is where most of the node's logic and behavior will come into play. For partial nodes this will be an event loop, and for full nodes we will use webhooks. Make sure to call `node.start()` and `node.stop()` at the beginning and end of your node's life cycle.
 
 ### Partial Node
 Make sure to set `source=KnowledgeSource.External`, this indicates to the knowledge processing pipeline that the incoming knowledge was received from an external source. Where the knowledge is sourced from will impact decisions in the node's knowledge handlers.
@@ -159,7 +160,7 @@ import time
 from koi_net.processor.knowledge_object import KnowledgeSource
 
 if __name__ == "__main__":
-    node.initialize()
+    node.start()
 
     try:
         while True:
@@ -170,20 +171,20 @@ if __name__ == "__main__":
             time.sleep(5)
             
     finally:
-        node.finalize()
+        node.stop()
 ```
 
 ### Full Node
-Setting up a full node is slightly more complex as we'll need a webserver. For this example, we'll use FastAPI and uvicorn. First we need to setup the "lifespan" of the server, to initialize and finalize the node before and after execution, as well as the FastAPI app which will be our web server.
+Setting up a full node is slightly more complex as we'll need a webserver. For this example, we'll use FastAPI and uvicorn. First we need to setup the "lifespan" of the server, to start and stop the node before and after execution, as well as the FastAPI app which will be our web server.
 ```python
 from contextlib import asynccontextmanager
 from fastapi import FastAPI
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    node.initialize()
+    node.start()
     yield
-    node.finalize()
+    node.stop()
 
 
 app = FastAPI(lifespan=lifespan, root_path="/koi-net")
@@ -196,11 +197,9 @@ from koi_net.protocol.api_models import *
 from koi_net.protocol.consts import *
 
 @app.post(BROADCAST_EVENTS_PATH)
-def broadcast_events(req: EventsPayload, background: BackgroundTasks):
+def broadcast_events(req: EventsPayload):
     for event in req.events:
         node.processor.handle(event=event, source=KnowledgeSource.External)
-    
-    background.add_task(node.processor.flush_kobj_queue)
 ```
 
 Next we can add the event polling endpoint, this allows partial nodes to receive events from us.
@@ -265,12 +264,16 @@ class NodeInterface:
     network: NetworkInterface
     processor: ProcessorInterface
     first_contact: str
+    use_kobj_processor_thread: bool
 
     def __init__(
         self, 
         name: str,
         profile: NodeProfile,
         identity_file_path: str = "identity.json",
+        event_queues_file_path: str = "event_queues.json",
+        cache_directory_path: str = "rid_cache",
+        use_kobj_processor_thread: bool = False,
         first_contact: str | None = None,
         handlers: list[KnowledgeHandler] | None = None,
         cache: Cache | None = None,
@@ -278,8 +281,8 @@ class NodeInterface:
         processor: ProcessorInterface | None = None
     ): ...
 
-    def initialize(self): ...
-    def finalize(self): ...
+    def start(self): ...
+    def stop(self): ...
 ```
 As you can see, only a name and profile are required. The other fields allow for additional customization if needed.
 
@@ -313,7 +316,6 @@ class NetworkInterface:
     
     def flush_poll_queue(self, node: KoiNetNode) -> list[Event]: ...
     def flush_webhook_queue(self, node: RID): ...
-    def flush_all_webhook_queues(self): ...
 
     def fetch_remote_bundle(self, rid: RID): ...
     def fetch_remote_manifest(self, rid: RID): ...
@@ -432,11 +434,14 @@ def poll_events(req: PollEvents) -> EventsPayload:
 The `ProcessorInterface` class provides access to a node's internal knowledge processing pipeline.
 ```python
 class ProcessorInterface:
+    worker_thread: threading.Thread | None = None
+
     def __init__(
         self, 
         cache: Cache, 
         network: NetworkInterface,
         identity: NodeIdentity,
+        use_kobj_processor_thread: bool,
         default_handlers: list[KnowledgeHandler] = []
     ): ...
 

{koi_net-1.0.0b6.dist-info → koi_net-1.0.0b8.dist-info}/RECORD

@@ -1,24 +1,24 @@
 koi_net/__init__.py,sha256=b0Ze0pZmJAuygpWUFHM6Kvqo3DkU_uzmkptv1EpAArw,31
-koi_net/core.py,sha256=BzD1QWNaC0M13NHjBW-t-1qazksKfwAxSqliRowMNac,3550
+koi_net/core.py,sha256=dE4sE2qsoIRUU1zsnrjx7aqYtYdHyCx-Dv4cwbkRjy4,4613
 koi_net/identity.py,sha256=PBgmAx5f3zzQmHASB1TJW2g19n9TLfmSJMXg2eQFg0A,2386
 koi_net/network/__init__.py,sha256=r_RN-q_mDYC-2RAkN-lJoMUX76TXyfEUc_MVKW87z0g,39
-koi_net/network/graph.py,sha256=SbA0ATIYaiBnq6PCEN2Mu7dgmfyZW3p5tRhZu23UR4E,4782
-koi_net/network/interface.py,sha256=paBJjQFJC8UkUz-BWeRwvuWD2cv8WFt7PyhoV7VOhWI,10823
+koi_net/network/graph.py,sha256=KMUCU3AweRvivwy7GuWgX2zX74FPgHeVMO5ydvhVyvA,4833
+koi_net/network/interface.py,sha256=4JTeg8Eah0z5YKhcVKJbCVZw_Ghl_6xfG8aa1I5PCWI,10643
 koi_net/network/request_handler.py,sha256=fhuCDsxI8fZ4p5TntcTZR4mnLrLQ61zDy7Oca3ooFCE,4402
-koi_net/network/response_handler.py,sha256=mA3FtrN3aTZATcLaHQhJUWrJdIKNv6d24fhvOl-nDKY,1890
+koi_net/network/response_handler.py,sha256=HaP8Fl0bp_lfMmevhdVY8s9o0Uf8CR1ZaW5g3jsX8gw,1888
 koi_net/processor/__init__.py,sha256=x4fAY0hvQEDcpfdTB3POIzxBQjYAtn0qQazPo1Xm0m4,41
 koi_net/processor/default_handlers.py,sha256=Yc7a9n5sAOYMHzzY59VMXYOxQL-6O9zbMQzd61XbIEs,7184
 koi_net/processor/handler.py,sha256=APCECwU7MFcgP7Vu6UTngs0XIjaXSQ_f8rqy8cH5_rM,2242
-koi_net/processor/interface.py,sha256=qd4hBzNkNuNoDflzJSV7tuZOx0iRp6dG6tnafh1AWt8,11093
+koi_net/processor/interface.py,sha256=szLLeDfMgeqU35F2na-LvzytJ0irpCtR9g0empo4JoI,12169
 koi_net/processor/knowledge_object.py,sha256=cGv33fwNZQMylkhlTaQTbk96FVIVbdOUaBsG06u0m4k,4187
 koi_net/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-koi_net/protocol/api_models.py,sha256=79B5IWQ7gsJ_QIsSRv9424F1frF_DMGkhBbYWkXgtOI,1118
+koi_net/protocol/api_models.py,sha256=RDwVHAahiWzwzUnlj5MIm9et5WVpQOaG-Uscv1B9coU,1116
 koi_net/protocol/consts.py,sha256=zeWJvRpqcERrqJq39heyNHb6f_9QrvoBZJHd70yE914,249
 koi_net/protocol/edge.py,sha256=G3D9Ie0vbTSMJdoTw9g_oBmFCqzJ1gO7U1PVrw7p3j8,447
 koi_net/protocol/event.py,sha256=dzJmcHbimo7p5NwH2drccF0vMcAj9oQRj3iZ9Bjf7kg,1275
 koi_net/protocol/helpers.py,sha256=9E9PaoIuSNrTBATGCLJ_kSBMZ2z-KIMnLJzGOTqQDC0,719
 koi_net/protocol/node.py,sha256=Ntrx01dbm39ViKGtr4gLmztcMwKpTIweS6rRL-zoU_Y,391
-koi_net-1.0.0b6.dist-info/METADATA,sha256=2fUM02c7-EieTdAA-WNI_6WgRPFofhURpNRJuAwlB_k,21211
-koi_net-1.0.0b6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.0.0b6.dist-info/licenses/LICENSE,sha256=XBcvl8yjCAezfuqN1jadQykrX7H2g4nr2WRDmHLW6ik,1090
-koi_net-1.0.0b6.dist-info/RECORD,,
+koi_net-1.0.0b8.dist-info/METADATA,sha256=-oGUkUtRG4biV7yo7WIl2XiDv4k8wVTV_DbyebOiuoI,21352
+koi_net-1.0.0b8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+koi_net-1.0.0b8.dist-info/licenses/LICENSE,sha256=XBcvl8yjCAezfuqN1jadQykrX7H2g4nr2WRDmHLW6ik,1090
+koi_net-1.0.0b8.dist-info/RECORD,,