Merge pull request #4 from BlockScience/dev

v1.0.0-beta.16

Author: lukvmil

pyproject.toml

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

src/koi_net/config.py

@@ -40,7 +40,7 @@ def __getattribute__(self, name):
             return env_val
         return value
 
-class Config(BaseModel):
+class NodeConfig(BaseModel):
     server: ServerConfig | None = Field(default_factory=ServerConfig)
     koi_net: KoiNetConfig
     _file_path: str = PrivateAttr(default="config.yaml")
@@ -49,7 +49,7 @@ class Config(BaseModel):
     @classmethod
     def load_from_yaml(
         cls, 
-        file_path: str | None = None, 
+        file_path: str = "config.yaml", 
         generate_missing: bool = True
     ):
         yaml = YAML()
@@ -62,8 +62,14 @@ def load_from_yaml(
             config._file_content = file_content
 
         except FileNotFoundError:
+            # empty_fields = {}
+            # for name, field in cls.model_fields.items():
+                
+            #     if field.default is None or field.default_factory is None:
+            # print(empty_fields)
             config = cls()
 
+            
         config._file_path = file_path
 
         if generate_missing:            
@@ -92,4 +98,4 @@ def save_to_yaml(self):
                     f.write(self._file_content)
                 raise e
 
-ConfigType = TypeVar("ConfigType", bound=Config)
+ConfigType = TypeVar("ConfigType", bound=NodeConfig)

src/koi_net/identity.py

@@ -3,7 +3,7 @@
 from rid_lib.ext.cache import Cache
 from rid_lib.types.koi_net_node import KoiNetNode
 
-from .config import Config
+from .config import NodeConfig
 from .protocol.node import NodeProfile
 
 logger = logging.getLogger(__name__)
@@ -12,12 +12,12 @@
 class NodeIdentity:
     """Represents a node's identity (RID, profile, bundle)."""
 
-    config: Config    
+    config: NodeConfig    
     cache: Cache
 
     def __init__(
         self,
-        config: Config,
+        config: NodeConfig,
         cache: Cache
     ):
         """Initializes node identity from a name and profile.

src/koi_net/network/interface.py

@@ -15,7 +15,7 @@
 from ..protocol.edge import EdgeType
 from ..protocol.event import Event
 from ..identity import NodeIdentity
-from ..config import Config, ConfigType
+from ..config import ConfigType
 
 logger = logging.getLogger(__name__)
 

src/koi_net/processor/interface.py

@@ -9,7 +9,7 @@
 from ..identity import NodeIdentity
 from ..network import NetworkInterface
 from ..protocol.event import Event, EventType
-from ..config import Config
+from ..config import NodeConfig
 from .handler import (
     KnowledgeHandler, 
     HandlerType, 
@@ -28,7 +28,7 @@
 class ProcessorInterface():
     """Provides access to this node's knowledge processing pipeline."""
 
-    config: Config
+    config: NodeConfig
     cache: Cache
     network: NetworkInterface
     identity: NodeIdentity
@@ -39,7 +39,7 @@ class ProcessorInterface():
 
     def __init__(
         self,
-        config: Config,
+        config: NodeConfig,
         cache: Cache, 
         network: NetworkInterface,
         identity: NodeIdentity,