attempt to refactor config system. separate subsystem ConfigLoader handles reading and writing to YAML, config components now separated by full/partial node, generating on missing logic moved to model validators, added support for non factories to dependency injection framework -- detects non callables, and Pydantic BaseModels and treats them as is

Author: lukvmil

examples/coordinator.py

@@ -1,10 +1,14 @@
 import logging
 from rich.logging import RichHandler
-from pydantic import Field
 from rid_lib.types import KoiNetNode, KoiNetEdge
-from koi_net.config import NodeConfig, KoiNetConfig, ServerConfig
-from koi_net.core import NodeAssembler
-from koi_net.protocol.node import NodeProfile, NodeProvides, NodeType
+from koi_net.config.full_node import (
+    FullNodeConfig, 
+    ServerConfig, 
+    KoiNetConfig, 
+    NodeProfile, 
+    NodeProvides
+)
+from koi_net.core import FullNode
 from koi_net.context import HandlerContext
 from koi_net.processor.handler import HandlerType, KnowledgeHandler
 from koi_net.processor.knowledge_object import KnowledgeObject
@@ -22,22 +26,17 @@
 logger = logging.getLogger(__name__)
 
 
-class CoordinatorConfig(NodeConfig):
-    server: ServerConfig = Field(default_factory=lambda: 
-        ServerConfig(port=8080)
-    )
-    koi_net: KoiNetConfig = Field(default_factory = lambda:
-        KoiNetConfig(
-            node_name="coordinator",
-            node_profile=NodeProfile(
-                node_type=NodeType.FULL,
-                provides=NodeProvides(
-                    event=[KoiNetNode, KoiNetEdge],
-                    state=[KoiNetNode, KoiNetEdge]
-                )
-            ),
-            rid_types_of_interest=[KoiNetNode, KoiNetEdge]
-        )
+class CoordinatorConfig(FullNodeConfig):
+    server: ServerConfig = ServerConfig(port=8080)
+    koi_net: KoiNetConfig = KoiNetConfig(
+        node_name="coordinator",
+        node_profile=NodeProfile(
+            provides=NodeProvides(
+                event=[KoiNetNode, KoiNetEdge],
+                state=[KoiNetNode, KoiNetEdge]
+            )
+        ),
+        rid_types_of_interest=[KoiNetNode, KoiNetEdge]
     )
 
 @KnowledgeHandler.create(
@@ -70,14 +69,10 @@ def handshake_handler(ctx: HandlerContext, kobj: KnowledgeObject):
     ctx.kobj_queue.put_kobj(rid=edge_bundle.rid, event_type=EventType.FORGET)
     ctx.kobj_queue.put_kobj(bundle=edge_bundle)
 
-class CoordinatorNodeAssembler(NodeAssembler):
+class CoordinatorNode(FullNode):
     config = CoordinatorConfig
-    knowledge_handlers = [
-        *NodeAssembler.knowledge_handlers,
-        handshake_handler
-    ]
-
+    knowledge_handlers = FullNode.knowledge_handlers + [handshake_handler]
 
 if __name__ == "__main__":
-    node = CoordinatorNodeAssembler.create()
-    node.server.run()
+    node = CoordinatorNode()
+    node.entrypoint.run()

examples/partial.py

@@ -1,9 +1,8 @@
 import logging
-from pydantic import Field
 from rich.logging import RichHandler
-from koi_net.core import NodeAssembler
-from koi_net.protocol.node import NodeProfile, NodeType
-from koi_net.config import NodeConfig, KoiNetConfig
+from koi_net.config.partial_node import PartialNodeConfig, KoiNetConfig, NodeProfile
+from koi_net.core import PartialNode
+
 
 logging.basicConfig(
     level=logging.INFO,
@@ -16,20 +15,16 @@
 logger = logging.getLogger(__name__)
 
 
-class PartialNodeConfig(NodeConfig):
-    koi_net: KoiNetConfig = Field(default_factory = lambda:
-        KoiNetConfig(
-            node_name="partial",
-            node_profile=NodeProfile(
-                node_type=NodeType.PARTIAL
-            )
-        )
+class MyPartialNodeConfig(PartialNodeConfig):
+    koi_net: KoiNetConfig = KoiNetConfig(
+        node_name="partial",
+        node_profile=NodeProfile()
     )
 
-class PartialNodeAssembler(NodeAssembler):
-    config = PartialNodeConfig
+class MyPartialNode(PartialNode):
+    config_cls = MyPartialNodeConfig
 
 
 if __name__ == "__main__":
-    node = PartialNodeAssembler.create()
-    node.poller.run()
+    node = MyPartialNode()
+    # node.entrypoint.run()

src/koi_net/__init__.py

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

src/koi_net/assembler.py

@@ -2,6 +2,7 @@
 from typing import Protocol
 from dataclasses import make_dataclass
 
+from pydantic import BaseModel
 import structlog
 
 from .interfaces.entrypoint import EntryPoint
@@ -41,13 +42,25 @@ def __new__(self) -> NodeContainer:
     @classmethod
     def _build(cls) -> NodeContainer:
         components = {}
-        for comp_name in cls._build_order:            
-            comp_factory = getattr(cls, comp_name, None)
+        for comp_name in cls._build_order:
+            comp = getattr(cls, comp_name, None)
 
-            if comp_factory is None:
+            if comp is None:
                 raise Exception(f"Couldn't find factory for component '{comp_name}'")
 
-            sig = inspect.signature(comp_factory)
+            print(comp_name)
+            
+            if not callable(comp):
+                print(f"Treating {comp_name} as a literal")
+                components[comp_name] = comp
+                continue
+            
+            if issubclass(comp, BaseModel):
+                print(f"Treating {comp_name} as a pydantic model")
+                components[comp_name] = comp
+                continue
+            
+            sig = inspect.signature(comp)
 
             required_comps = []
             for name, param in sig.parameters.items():
@@ -58,7 +71,7 @@ def _build(cls) -> NodeContainer:
             else:
                 s = f"{comp_name} -> {', '.join([name for name, _type in required_comps])}"
 
-            print(s.replace("graph", "_graph"), end=";\n")
+            # print(s.replace("graph", "_graph"), end=";\n")
 
             dependencies = {}
             for req_comp_name, req_comp_type in required_comps:
@@ -67,7 +80,7 @@ def _build(cls) -> NodeContainer:
 
                 dependencies[req_comp_name] = components[req_comp_name]
 
-            components[comp_name] = comp_factory(**dependencies)
+            components[comp_name] = comp(**dependencies)
 
         NodeContainer = make_dataclass(
             cls_name="NodeContainer",

src/koi_net/cli/models.py

@@ -1,9 +1,9 @@
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic import BaseModel, PrivateAttr
 from ruamel.yaml import YAML
 
 
 class KoiNetworkConfig(BaseModel):
-    nodes: dict[str, str] = Field(default_factory=dict)
+    nodes: dict[str, str] = {}
     _file_path: str = PrivateAttr(default="koi-net-config.yaml")
 
     @classmethod