koi-net 1.2.0b1__py3-none-any.whl → 1.2.0b2__py3-none-any.whl

koi_net/__init__.py

@@ -1 +1,2 @@
-from .core import NodeContainer
+from . import logger
+from . import sentry

koi_net/assembler.py

@@ -0,0 +1,82 @@
+import inspect
+from typing import Protocol
+from dataclasses import make_dataclass
+
+import structlog
+
+from .interfaces.entrypoint import EntryPoint
+
+log = structlog.stdlib.get_logger()
+
+
+class BuildOrderer(type):
+    def __new__(cls, name: str, bases: tuple, dct: dict[str]):
+        """Sets `cls._build_order` from component order in class definition."""
+        cls = super().__new__(cls, name, bases, dct)
+        
+        if "_build_order" not in dct:
+            components = {}
+            # adds components from base classes (including cls)
+            for base in reversed(inspect.getmro(cls)[:-1]):
+                for k, v in vars(base).items():
+                    # excludes built in and private attributes
+                    if not k.startswith("_"):
+                        components[k] = v
+                        
+            # recipe list constructed from names of non-None components
+            cls._build_order = [
+                name for name, _type in components.items()
+                if _type is not None
+            ]
+            
+        return cls
+
+class NodeContainer(Protocol):
+    entrypoint = EntryPoint
+
+class NodeAssembler(metaclass=BuildOrderer):    
+    def __new__(self) -> NodeContainer:
+        return self._build()
+    
+    @classmethod
+    def _build(cls) -> NodeContainer:
+        components = {}
+        for comp_name in cls._build_order:            
+            comp_factory = getattr(cls, comp_name, None)
+            
+            if comp_factory is None:
+                raise Exception(f"Couldn't find factory for component '{comp_name}'")
+            
+            sig = inspect.signature(comp_factory)
+            
+            required_comps = []
+            for name, param in sig.parameters.items():
+                required_comps.append((name, param.annotation))
+            
+            if len(required_comps) == 0:
+                s = comp_name
+            else:
+                s = f"{comp_name} -> {', '.join([name for name, _type in required_comps])}"
+            
+            print(s.replace("graph", "_graph"), end=";\n")
+            
+            dependencies = {}
+            for req_comp_name, req_comp_type in required_comps:
+                if req_comp_name not in components:
+                    raise Exception(f"Couldn't find required component '{req_comp_name}'")
+                    
+                dependencies[req_comp_name] = components[req_comp_name]
+                
+            components[comp_name] = comp_factory(**dependencies)
+        
+        NodeContainer = make_dataclass(
+            cls_name="NodeContainer",
+            fields=[
+                (name, type(component)) 
+                for name, component
+                in components.items()
+            ],
+            frozen=True
+        )
+        
+        return NodeContainer(**components)

koi_net/context.py

@@ -1,5 +1,6 @@
 from rid_lib.ext import Cache
 
+from koi_net.effector import Effector
 from koi_net.network.resolver import NetworkResolver
 from .config import NodeConfig
 from .network.graph import NetworkGraph
@@ -9,18 +10,6 @@ from .identity import NodeIdentity
 from .processor.kobj_queue import KobjQueue
 
 
-class ActionContext:
-    """Provides action handlers access to other subsystems."""
-    
-    identity: NodeIdentity
-
-    def __init__(
-        self,
-        identity: NodeIdentity,
-    ):
-        self.identity = identity
-    
-
 class HandlerContext:
     """Provides knowledge handlers access to other subsystems."""
     
@@ -32,6 +21,7 @@ class HandlerContext:
     graph: NetworkGraph
     request_handler: RequestHandler
     resolver: NetworkResolver
+    effector: Effector
     
     def __init__(
         self,
@@ -43,6 +33,7 @@ class HandlerContext:
         graph: NetworkGraph,
         request_handler: RequestHandler,
         resolver: NetworkResolver,
+        effector: Effector
     ):
         self.identity = identity
         self.config = config
@@ -51,4 +42,5 @@ class HandlerContext:
         self.kobj_queue = kobj_queue
         self.graph = graph
         self.request_handler = request_handler
-        self.resolver = resolver
+        self.resolver = resolver
+        self.effector = effector

koi_net/core.py

@@ -1,22 +1,21 @@
-from dataclasses import dataclass
 from rid_lib.ext import Cache
-from koi_net.behaviors import Behaviors
-from koi_net.config import NodeConfig
-from koi_net.context import ActionContext, HandlerContext
-from koi_net.effector import Effector
-from koi_net.handshaker import Handshaker
-from koi_net.identity import NodeIdentity
-from koi_net.kobj_worker import KnowledgeProcessingWorker
-from koi_net.lifecycle import NodeLifecycle
-from koi_net.network.error_handler import ErrorHandler
-from koi_net.network.event_queue import EventQueue
-from koi_net.network.graph import NetworkGraph
-from koi_net.network.request_handler import RequestHandler
-from koi_net.network.resolver import NetworkResolver
-from koi_net.network.response_handler import ResponseHandler
-from koi_net.poll_event_buffer import PollEventBuffer
-from koi_net.poller import NodePoller
-from koi_net.processor.default_handlers import (
+from .assembler import NodeAssembler
+from .config.base import BaseConfig
+from .context import HandlerContext
+from .effector import Effector
+from .handshaker import Handshaker
+from .identity import NodeIdentity
+from .processor.kobj_worker import KnowledgeProcessingWorker
+from .lifecycle import NodeLifecycle
+from .network.error_handler import ErrorHandler
+from .network.event_queue import EventQueue
+from .network.graph import NetworkGraph
+from .network.request_handler import RequestHandler
+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 (
     basic_manifest_handler, 
     basic_network_output_filter, 
     basic_rid_handler, 
@@ -25,51 +24,28 @@ from koi_net.processor.default_handlers import (
     forget_edge_on_node_deletion, 
     secure_profile_handler
 )
-from koi_net.processor.event_worker import EventProcessingWorker
-from koi_net.processor.knowledge_pipeline import KnowledgePipeline
-from koi_net.processor.kobj_queue import KobjQueue
-from koi_net.secure import Secure
-from koi_net.server import NodeServer
+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
 
 
-@dataclass
-class NodeContainer:
-    poll_event_buf: PollEventBuffer
-    kobj_queue: KobjQueue
-    event_queue: EventQueue
-    config: NodeConfig
-    cache: Cache
-    identity: NodeIdentity
-    graph: NetworkGraph
-    secure: Secure
-    request_handler: RequestHandler
-    response_handler: ResponseHandler
-    resolver: NetworkResolver
-    handler_context: HandlerContext
-    behaviors: Behaviors
-    pipeline: KnowledgePipeline
-    kobj_worker: KnowledgeProcessingWorker
-    event_worker: EventProcessingWorker
-    error_handler: ErrorHandler
-    lifecycle: NodeLifecycle
-    server: NodeServer
-    poller: NodePoller
-    
+# factory functions for components with non standard initializiation
 
-class NodeAssembler:
-    poll_event_buf = PollEventBuffer
+def make_config() -> BaseConfig:
+    return BaseConfig.load_from_yaml()
+
+def make_cache(config: BaseConfig) -> Cache:
+    return Cache(directory_path=config.koi_net.cache_directory_path)
+
+
+class BaseNode(NodeAssembler):
+    config = lambda: None
     kobj_queue = KobjQueue
     event_queue = EventQueue
-    config = NodeConfig
-    cache = Cache
-    identity = NodeIdentity
-    graph = NetworkGraph
-    secure = Secure
-    handshaker = Handshaker
-    request_handler = RequestHandler
-    response_handler = ResponseHandler
-    resolver = NetworkResolver
-    knowledge_handlers = [
+    poll_event_buf = PollEventBuffer
+    knowledge_handlers = lambda: [
         basic_rid_handler,
         basic_manifest_handler,
         secure_profile_handler,
@@ -78,156 +54,25 @@ class NodeAssembler:
         basic_network_output_filter,
         forget_edge_on_node_deletion
     ]
-    handler_context = HandlerContext
-    action_context = ActionContext
+    cache = make_cache
+    identity = NodeIdentity
+    graph = NetworkGraph
+    secure = Secure
+    handshaker = Handshaker
+    error_handler = ErrorHandler
+    request_handler = RequestHandler
+    response_handler = ResponseHandler
+    resolver = NetworkResolver
     effector = Effector
-    behaviors = Behaviors
+    handler_context = HandlerContext
     pipeline = KnowledgePipeline
     kobj_worker = KnowledgeProcessingWorker
     event_worker = EventProcessingWorker
-    error_handler = ErrorHandler
     lifecycle = NodeLifecycle
-    server = NodeServer
-    poller = NodePoller
-    
-    @classmethod
-    def create(cls) -> NodeContainer:
-        poll_event_buffer = cls.poll_event_buf()
-        kobj_queue = cls.kobj_queue()
-        event_queue = cls.event_queue()
-        config = cls.config.load_from_yaml()
-        cache = cls.cache(
-            directory_path=config.koi_net.cache_directory_path
-        )
-        identity = cls.identity(
-            config=config
-        )
-        graph = cls.graph(
-            cache=cache,
-            identity=identity
-        )
-        secure = cls.secure(
-            identity=identity,
-            cache=cache,
-            config=config
-        )
-        handshaker = cls.handshaker(
-            cache=cache,
-            identity=identity,
-            event_queue=event_queue
-        )
-        error_handler = cls.error_handler(
-            kobj_queue=kobj_queue,
-            handshaker=handshaker
-        )
-        request_handler = cls.request_handler(
-            cache=cache,
-            identity=identity,
-            secure=secure,
-            error_handler=error_handler
-        )
-        response_handler = cls.response_handler(
-            cache=cache
-        )
-        resolver = cls.resolver(
-            config=config,
-            cache=cache,
-            identity=identity,
-            graph=graph,
-            request_handler=request_handler
-        )
-        handler_context = cls.handler_context(
-            identity=identity,
-            config=config,
-            cache=cache,
-            event_queue=event_queue,
-            kobj_queue=kobj_queue,
-            graph=graph,
-            request_handler=request_handler,
-            resolver=resolver
-        )
-        action_context = cls.action_context(
-            identity=identity
-        )
-        effector = cls.effector(
-            cache=cache,
-            resolver=resolver,
-            kobj_queue=kobj_queue,
-            action_context=action_context
-        )
-        behaviors = cls.behaviors(
-            cache=cache,
-            identity=identity,
-            event_queue=event_queue,
-            resolver=resolver,
-            request_handler=request_handler,
-            kobj_queue=kobj_queue
-        )
-        pipeline = cls.pipeline(
-            handler_context=handler_context,
-            cache=cache,
-            request_handler=request_handler,
-            event_queue=event_queue,
-            graph=graph,
-            knowledge_handlers=cls.knowledge_handlers
-        )
-        kobj_worker = cls.kobj_worker(
-            kobj_queue=kobj_queue,
-            pipeline=pipeline
-        )
-        event_worker = cls.event_worker(
-            config=config,
-            cache=cache,
-            event_queue=event_queue,
-            request_handler=request_handler,
-            poll_event_buf=poll_event_buffer
-        )
-        lifecycle = cls.lifecycle(
-            config=config,
-            identity=identity,
-            graph=graph,
-            kobj_queue=kobj_queue,
-            kobj_worker=kobj_worker,
-            event_queue=event_queue,
-            event_worker=event_worker,
-            cache=cache,
-            handshaker=handshaker,
-            behaviors=behaviors
-        )
-        server = cls.server(
-            config=config,
-            lifecycle=lifecycle,
-            secure=secure,
-            kobj_queue=kobj_queue,
-            response_handler=response_handler,
-            poll_event_buf=poll_event_buffer
-        )
-        poller = cls.poller(
-            kobj_queue=kobj_queue,
-            lifecycle=lifecycle,
-            resolver=resolver,
-            config=config
-        )
-        
-        return NodeContainer(
-            poll_event_buf=poll_event_buffer,
-            kobj_queue=kobj_queue,
-            event_queue=event_queue,
-            config=config,
-            cache=cache,
-            identity=identity,
-            graph=graph,
-            secure=secure,
-            request_handler=request_handler,
-            response_handler=response_handler,
-            resolver=resolver,
-            handler_context=handler_context,
-            behaviors=behaviors,
-            pipeline=pipeline,
-            kobj_worker=kobj_worker,
-            event_worker=event_worker,
-            error_handler=error_handler,
-            lifecycle=lifecycle,
-            server=server,
-            poller=poller
-        )
+
+
+class FullNode(BaseNode):
+    entrypoint = NodeServer
+
+class PartialNode(BaseNode):
+    entrypoint = NodePoller

koi_net/effector.py

@@ -1,4 +1,4 @@
-import logging
+import structlog
 from typing import Callable
 from enum import StrEnum
 from rid_lib.ext import Cache, Bundle
@@ -6,11 +6,23 @@ from rid_lib.core import RID, RIDType
 from rid_lib.types import KoiNetNode
 from .network.resolver import NetworkResolver
 from .processor.kobj_queue import KobjQueue
-from .context import ActionContext
+from .identity import NodeIdentity
 
-logger = logging.getLogger(__name__)
+log = structlog.stdlib.get_logger()
 
 
+class ActionContext:
+    """Provides action handlers access to other subsystems."""
+    
+    identity: NodeIdentity
+
+    def __init__(
+        self,
+        identity: NodeIdentity,
+    ):
+        self.identity = identity
+    
+
 class BundleSource(StrEnum):
     CACHE = "CACHE"
     ACTION = "ACTION"
@@ -35,12 +47,12 @@ class Effector:
         cache: Cache,
         resolver: NetworkResolver,
         kobj_queue: KobjQueue,
-        action_context: ActionContext
+        identity: NodeIdentity
     ):
         self.cache = cache
         self.resolver = resolver
         self.kobj_queue = kobj_queue
-        self.action_context = action_context
+        self.action_context = ActionContext(identity)
         self._action_table = self.__class__._action_table.copy()
     
     @classmethod
@@ -70,18 +82,18 @@ class Effector:
         bundle = self.cache.read(rid)
         
         if bundle:
-            logger.debug("Cache hit")
+            log.debug("Cache hit")
             return bundle, BundleSource.CACHE
         else:
-            logger.debug("Cache miss")
+            log.debug("Cache miss")
             return None
                     
     def _try_action(self, rid: RID) -> tuple[Bundle, BundleSource] | None:
         if type(rid) not in self._action_table:
-            logger.debug("No action available")
+            log.debug("No action available")
             return None
         
-        logger.debug("Action available")
+        log.debug("Action available")
         func = self._action_table[type(rid)]
         bundle = func(
             ctx=self.action_context, 
@@ -89,10 +101,10 @@ class Effector:
         )
         
         if bundle:
-            logger.debug("Action hit")
+            log.debug("Action hit")
             return bundle, BundleSource.ACTION
         else:
-            logger.debug("Action miss")
+            log.debug("Action miss")
             return None
 
         
@@ -100,10 +112,10 @@ class Effector:
         bundle, source = self.resolver.fetch_remote_bundle(rid)
         
         if bundle:
-            logger.debug("Network hit")
+            log.debug("Network hit")
             return bundle, source
         else:
-            logger.debug("Network miss")
+            log.debug("Network miss")
             return None
         
     
@@ -127,7 +139,7 @@ class Effector:
             handle_result: handles resulting bundle with knowledge pipeline when `True`
         """
         
-        logger.debug(f"Dereferencing {rid!r}")
+        log.debug(f"Dereferencing {rid!r}")
         
         bundle, source = (
             # if `refresh_cache`, skip try cache

koi_net/handshaker.py

@@ -1,11 +1,11 @@
-from logging import getLogger
+import structlog
 from rid_lib.ext import Cache
 from rid_lib.types import KoiNetNode
 from koi_net.identity import NodeIdentity
 from koi_net.network.event_queue import EventQueue
 from .protocol.event import Event, EventType
 
-logger = getLogger(__name__)
+log = structlog.stdlib.get_logger()
 
 
 class Handshaker:
@@ -24,7 +24,7 @@ class Handshaker:
         Pushes successive `FORGET` and `NEW` events to target node to
         reset the target's cache in case it already knew this node. 
         """
-        logger.debug(f"Initiating handshake with {target}")
+        log.debug(f"Initiating handshake with {target}")
         self.event_queue.push_event_to(
             Event.from_rid(
                 event_type=EventType.FORGET, 

koi_net/identity.py

@@ -1,10 +1,9 @@
-import logging
+import structlog
 from rid_lib.types.koi_net_node import KoiNetNode
 from .config import NodeConfig
 from .protocol.node import NodeProfile
 
-
-logger = logging.getLogger(__name__)
+log = structlog.stdlib.get_logger()
 
     
 class NodeIdentity:

koi_net/interfaces/entrypoint.py

@@ -0,0 +1,5 @@
+from typing import Protocol
+
+
+class EntryPoint(Protocol):
+    def run(self): ...

koi_net/{worker.py → interfaces/worker.py}

@@ -1,5 +1,12 @@
 import threading
 
+
+class End:
+    """Class for a sentinel value by knowledge handlers."""
+    pass
+
+STOP_WORKER = End()
+
 class ThreadWorker:
     thread: threading.Thread