readded init command, added help for wipe-config command, added block param to network and node start/stop, dropped logs sent to a .txt file, not an ndjson file, version bump -> 1.3.0-beta.8

Author: lukvmil

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "koi-net"
-version = "1.3.0-beta.7"
+version = "1.3.0-beta.8"
 description = "Implementation of KOI-net protocol in Python"
 authors = [
     {name = "Luke Miller", email = "luke@block.science"}

src/koi_net/interface/network.py

@@ -154,6 +154,11 @@ def wipe_logs(self):
         for node in self.nodes:
             if node.exists():
                 node.wipe_logs()
+    
+    def wipe_config(self):
+        for node in self.nodes:
+            if node.exists():
+                node.wipe_config()
 
     def run(self):
         try:
@@ -170,15 +175,15 @@ def run(self):
         finally:
             self.stop()
 
-    def start(self):
+    def start(self, block: bool = True):
         for name in self.config.nodes:
             node = self.resolve_node(name)
             if node.state() == NodeState.IDLE:
-                node.start()
+                node.start(block=block)
 
-    def stop(self):
+    def stop(self, block: bool = True):
         for name in reversed(self.config.nodes):
             node = self.resolve_node(name)
             if node.state() == NodeState.RUNNING:
-                node.stop()
+                node.stop(block=block)
 

src/koi_net/interface/node.py

@@ -63,6 +63,7 @@ def create(self):
         if self.initialized:
             self.console.print(f"Created node '{self.node.identity.rid}'")
         else:
+            # self.console.print("Failed to initialize, run `node init <name>` to try again")
             self.delete()
 
     def exists(self):
@@ -132,18 +133,18 @@ def run(self):
         finally:
             self.stop()
 
-    def start(self):
+    def start(self, block: bool = True):
         if self.state() == NodeState.IDLE:
             print(f"Starting {self.name}...", end=" ", flush=True)
-            self.node.start()
+            self.node.start(block=block)
             print("Done")
         else:
             print("Node already started")
 
-    def stop(self):
+    def stop(self, block: bool = True):
         if self.state() == NodeState.RUNNING:
             print(f"Stopping {self.name}...", end=" ", flush=True)
-            self.node.stop()
+            self.node.stop(block=block)
             print("Done")
         else:
             print("Node already stopped")

src/koi_net/interface/shell.py

@@ -78,7 +78,8 @@ def do_help(self, subcmd: str):
                 cmd_help = [
                     ("add", r"<module ref> \[name]", "adds a new node of type <module ref> to the network, if unset, name defaults to <module ref>"),
                     ("rm", "<name>", "removes a node from the network"),
-                    # ("init", "<name>", "initializes a node"),
+                    ("init", "<name>", "initializes a node"),
+                    ("wipe-config", "", "wipes a node's configuration, including private key"),
                     ("wipe-cache", "<name>", "wipes a node's RID cache"),
                     ("wipe-logs", "<name>", "wipes a node's logs"),
 
@@ -91,12 +92,12 @@ def do_help(self, subcmd: str):
                     ("start", "<name>", "starts a node in the background"),
                     ("stop", "<name>", "stops a running background node"),
 
-                    ("list", "", "lists all nodes in the network"),
-                    ("modules", "", "lists all available node modules and their aliases"),
+                    ("list", "", "lists all nodes in the network")
                 ]
             case "network":
                 cmd_help = [
                     ("sync", "", "synchronizes the local environment with the network configuration"),
+                    ("wipe-config", "", "wipes configuration, including private key, of all network nodes"),
                     ("wipe-cache", "", "wipes RID cache of all network nodes"),
                     ("wipe-logs", "", "wipes logs of all network nodes"),
                     ("status", "", "lists the current state of all network nodes"),
@@ -135,10 +136,10 @@ def do_node(self, sub_cmd: str, *args):
                 self.node_add(*args)
             case "rm":
                 self.node_rm(*args)
+            case "init":
+                self.node_init(*args)
             case "list":
                 self.node_list(*args)
-            case "modules":
-                self.module_list(*args)
             case "config-get":
                 self.node_config_get(*args)
             case "config-set":
@@ -230,6 +231,11 @@ def node_rm(self, node: NodeInterface):
                 return
 
         self.network.remove_node(node)
+        
+    @validate_args
+    @load_node
+    def node_init(self, node: NodeInterface):
+        node.init()
 
     @validate_args
     def node_list(self):
@@ -309,6 +315,10 @@ def network_wipe_cache(self):
     @validate_args
     def network_wipe_logs(self):
         self.network.wipe_logs()
+        
+    @validate_args
+    def network_wipe_config(self):
+        self.network.wipe_config()
 
     @validate_args
     def network_status(self):

src/koi_net/log_system.py

@@ -44,7 +44,7 @@ def __init__(
         )
 
         self.dropped_log_handler = RotatingFileHandler(
-            filename="dropped_logs.ndjson",
+            filename="dropped_logs.txt",
             maxBytes=self.max_log_file_size,
             backupCount=self.max_log_file_backups,
             encoding=self.log_file_encoding,
@@ -109,7 +109,7 @@ def __new__(
         use_file_handler: bool = True,
         use_console_handler: bool = True,
         file_handler_log_level: int = logging.DEBUG,
-        console_handler_log_level: int = logging.INFO
+        console_handler_log_level: int = logging.DEBUG
     ):
         """Only instantiable once, other calls will return the first object."""
         if not cls._instance: