restructuring and renaming, queues and buffer use 'push' instead of redundant push_kobj/push_event_to

Author: lukvmil

examples/coordinator.py

@@ -9,7 +9,7 @@
     NodeProvides
 )
 from koi_net.core import FullNode
-from koi_net.context import HandlerContext
+from koi_net.processor.context import HandlerContext
 from koi_net.processor.handler import HandlerType, KnowledgeHandler
 from koi_net.processor.knowledge_object import KnowledgeObject
 from koi_net.protocol.event import Event, EventType
@@ -51,7 +51,7 @@ def handshake_handler(ctx: HandlerContext, kobj: KnowledgeObject):
 
     logger.info("Sharing this node's bundle with peer")
     identity_bundle = ctx.cache.read(ctx.identity.rid)
-    ctx.event_queue.push_event_to(
+    ctx.event_queue.push(
         event=Event.from_bundle(EventType.NEW, identity_bundle),
         target=kobj.rid
     )
@@ -66,8 +66,8 @@ def handshake_handler(ctx: HandlerContext, kobj: KnowledgeObject):
         rid_types=[KoiNetNode, KoiNetEdge]
     )
 
-    ctx.kobj_queue.put_kobj(rid=edge_bundle.rid, event_type=EventType.FORGET)
-    ctx.kobj_queue.put_kobj(bundle=edge_bundle)
+    ctx.kobj_queue.push(rid=edge_bundle.rid, event_type=EventType.FORGET)
+    ctx.kobj_queue.push(bundle=edge_bundle)
 
 class CoordinatorNode(FullNode):
     config = CoordinatorConfig

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "koi-net"
-version = "1.2.0b2"
+version = "1.2.0b3"
 description = "Implementation of KOI-net protocol in Python"
 authors = [
     {name = "Luke Miller", email = "[email protected]"}

src/koi_net/assembler.py

@@ -5,7 +5,7 @@
 from pydantic import BaseModel
 import structlog
 
-from .interfaces.entrypoint import EntryPoint
+from .entrypoints.base import EntryPoint
 
 log = structlog.stdlib.get_logger()
 

src/koi_net/config/loader.py

@@ -16,12 +16,7 @@ def __getattr__(self, name):
         return getattr(self._config, name)
 
     def load_from_yaml(self):
-        """Loads config state from YAML file.
-        
-        Defaults to `config.yaml`. If `generate_missing` is set to 
-        `True`, a private key and RID will be generated if not already
-        present in the config.
-        """
+        """Loads config state from YAML file."""
         yaml = YAML()
 
         try:

src/koi_net/core.py

@@ -3,11 +3,11 @@
 from .config.loader import ConfigLoader
 from .assembler import NodeAssembler
 from .config.core import NodeConfig
-from .context import HandlerContext
+from .processor.context import HandlerContext
 from .effector import Effector
 from .handshaker import Handshaker
 from .identity import NodeIdentity
-from .processor.kobj_worker import KnowledgeProcessingWorker
+from .workers import KnowledgeProcessingWorker, EventProcessingWorker
 from .lifecycle import NodeLifecycle
 from .network.error_handler import ErrorHandler
 from .network.event_queue import EventQueue
@@ -16,8 +16,11 @@
 from .network.resolver import NetworkResolver
 from .network.response_handler import ResponseHandler
 from .network.poll_event_buffer import PollEventBuffer
-from .poller import NodePoller
-from .processor.handlers import (
+from .processor.pipeline import KnowledgePipeline
+from .processor.kobj_queue import KobjQueue
+from .secure import Secure
+from .entrypoints import NodeServer, NodePoller
+from .processor.knowledge_handlers import (
     basic_manifest_handler, 
     basic_network_output_filter, 
     basic_rid_handler, 
@@ -26,18 +29,6 @@
     forget_edge_on_node_deletion, 
     secure_profile_handler
 )
-from .processor.event_worker import EventProcessingWorker
-from .processor.pipeline import KnowledgePipeline
-from .processor.kobj_queue import KobjQueue
-from .secure import Secure
-from .server import NodeServer
-
-
-# factory functions for components with non standard initializiation
-
-
-def make_cache(config: NodeConfig) -> Cache:
-    return Cache(directory_path=config.koi_net.cache_directory_path)
 
 
 class BaseNode(NodeAssembler):
@@ -55,7 +46,8 @@ class BaseNode(NodeAssembler):
         basic_network_output_filter,
         forget_edge_on_node_deletion
     ]
-    cache = make_cache
+    cache = lambda config: Cache(
+        directory_path=config.koi_net.cache_directory_path)
     identity = NodeIdentity
     graph = NetworkGraph
     secure = Secure

src/koi_net/default_actions.py

@@ -1,9 +1,8 @@
 """Implementations of default dereference actions."""
 
-from .context import ActionContext
 from rid_lib.types import KoiNetNode
 from rid_lib.ext import Bundle
-from .effector import Effector
+from .effector import Effector, ActionContext
 
 
 @Effector.register_default_action(KoiNetNode)

src/koi_net/effector.py

@@ -155,7 +155,7 @@ def deref(
             and bundle is not None 
             and source != BundleSource.CACHE
         ):            
-            self.kobj_queue.put_kobj(
+            self.kobj_queue.push(
                 bundle=bundle, 
                 source=source if type(source) is KoiNetNode else None
             )

src/koi_net/entrypoint.py

@@ -0,0 +1,2 @@
+from .poller import NodePoller
+from .server import NodeServer

src/koi_net/entrypoints/__init__.py

@@ -0,0 +1,5 @@
+from koi_net.config.core import NodeConfig
+
+
+class EntryPoint:
+    def run(self): ...