Merge pull request #24 from BlockScience/dev

v1.2.3

Author: lukvmil

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "koi-net"
-version = "1.2.2"
+version = "1.2.3"
 description = "Implementation of KOI-net protocol in Python"
 authors = [
     {name = "Luke Miller", email = "luke@block.science"}
@@ -22,7 +22,6 @@ dependencies = [
     "cryptography>=45.0.3",
     "fastapi>=0.115.12",
     "uvicorn>=0.34.2",
-    "rich>=14.1.0",
     "structlog>=25.4.0",
 ]
 

src/koi_net/build/artifact.py

@@ -4,6 +4,7 @@
 
 import structlog
 
+from ..exceptions import BuildError
 from .consts import (
     COMP_ORDER_OVERRIDE,
     COMP_TYPE_OVERRIDE, 
@@ -77,7 +78,7 @@ def build_dependencies(self):
 
                 invalid_deps = set(dep_names) - set(self.comp_dict)
                 if invalid_deps:
-                    raise Exception(f"Dependencies {invalid_deps} of component '{comp_name}' are undefined")
+                    raise BuildError(f"Dependencies {invalid_deps} of component '{comp_name}' are undefined")
 
             self.dep_graph[comp_name] = dep_names
 
@@ -125,7 +126,7 @@ def build_init_order(self):
 
         if len(self.init_order) != len(self.dep_graph):
             cycle_nodes = set(self.dep_graph) - set(self.init_order)
-            raise Exception(f"Found cycle in dependency graph, the following nodes could not be ordered: {cycle_nodes}")
+            raise BuildError(f"Found cycle in dependency graph, the following nodes could not be ordered: {cycle_nodes}")
 
         log.debug(f"Resolved initialization order: {' -> '.join(self.init_order)}")
 

src/koi_net/build/assembler.py

@@ -3,6 +3,7 @@
 
 import structlog
 
+from ..exceptions import BuildError
 from .artifact import BuildArtifact, CompType
 from .container import NodeContainer
 
@@ -51,7 +52,7 @@ def _build_components(artifact: BuildArtifact):
                 dependencies = {}
                 for dep in artifact.dep_graph[comp_name]:
                     if dep not in components:
-                        raise Exception(f"Couldn't find required component '{dep}'")
+                        raise BuildError(f"Couldn't find required component '{dep}'")
                     dependencies[dep] = components[dep]
                 components[comp_name] = comp(**dependencies)
         log.debug("Done")

src/koi_net/config/loader.py

@@ -51,10 +51,10 @@ def save_to_yaml(self):
                 config_data = self.proxy._config.model_dump(mode="json")
                 yaml.dump(config_data, f)
 
-            except Exception as e:
+            except Exception:
                 # rewrites original content if YAML dump fails
                 if self.file_content:
                     f.seek(0)
                     f.truncate()
                     f.write(self.file_content)
-                raise e
+                raise

src/koi_net/config/proxy.py

@@ -1,4 +1,4 @@
-from koi_net.config.core import NodeConfig
+from .core import NodeConfig
 
 
 class ConfigProxy:
@@ -15,6 +15,6 @@ def __init__(self):
 
     def __getattr__(self, name):
         if not self._config:
-            raise Exception("Proxy called before config loaded")
+            raise RuntimeError("Proxy called before config loaded")
 
         return getattr(self._config, name)

src/koi_net/entrypoints/server.py

@@ -7,7 +7,7 @@
 from ..network.response_handler import ResponseHandler
 from ..protocol.model_map import API_MODEL_MAP
 from ..protocol.api_models import ErrorResponse
-from ..protocol.errors import ProtocolError
+from ..protocol.errors import EXCEPTION_TO_ERROR_TYPE, ProtocolError
 from ..config.full_node import FullNodeConfig
 
 log = structlog.stdlib.get_logger()
@@ -67,7 +67,8 @@ def build_app(self):
     def protocol_error_handler(self, request, exc: ProtocolError):
         """Catches `ProtocolError` and returns an `ErrorResponse` payload."""
         log.error(exc)
-        resp = ErrorResponse(error=exc.error_type)
+        resp = ErrorResponse(
+            error=EXCEPTION_TO_ERROR_TYPE[type(exc)])
         log.info(f"Returning error response: {resp}")
         return JSONResponse(
             status_code=400,

src/koi_net/exceptions.py

@@ -0,0 +1,47 @@
+# BASE EXCEPTION
+class KoiNetError(Exception):
+    """Base exception."""
+    pass
+
+# BUILD ERRORS
+class BuildError(KoiNetError):
+    """Raised when errors occur in build process."""
+    pass
+
+# NETWORK REQUEST ERRORS
+class RequestError(KoiNetError):
+    """Base for network request errors."""
+    pass
+
+class SelfRequestError(RequestError):
+    """Raised when a node tries to request itself."""
+    pass
+
+class PartialNodeQueryError(RequestError):
+    """Raised when attempting to query a partial node."""
+    pass
+
+class NodeNotFoundError(RequestError):
+    """Raised when a node URL cannot be found."""
+    pass
+
+# PROTOCOL RESPONSE ERRORS
+class ProtocolError(KoiNetError):
+    """Base for protocol response errors."""
+    pass
+
+class UnknownNodeError(ProtocolError):
+    """Raised when peer node is unknown."""
+    pass
+    
+class InvalidKeyError(ProtocolError):
+    """Raised when peer node's public key doesn't match their RID."""
+    pass
+    
+class InvalidSignatureError(ProtocolError):
+    """Raised when peer node's envelope signature is invalid."""
+    pass
+
+class InvalidTargetError(ProtocolError):
+    """Raised when peer node's target is not this node."""
+    pass

src/koi_net/network/request_handler.py

@@ -33,26 +33,6 @@
 log = structlog.stdlib.get_logger()
 
 
-class KoiNetRequestError(Exception):
-    pass
-
-# Custom error types for request handling
-class SelfRequestError(KoiNetRequestError):
-    """Raised when a node tries to request itself."""
-    pass
-
-class PartialNodeQueryError(KoiNetRequestError):
-    """Raised when attempting to query a partial node."""
-    pass
-
-class NodeNotFoundError(KoiNetRequestError):
-    """Raised when a node URL cannot be found."""
-    pass
-
-class UnknownPathError(KoiNetRequestError):
-    """Raised when an unknown path is requested."""
-    pass
-
 class RequestHandler:
     """Handles making requests to other KOI nodes."""
 

src/koi_net/protocol/errors.py

@@ -1,6 +1,13 @@
 """Defines KOI-net protocol errors."""
 
 from enum import StrEnum
+from ..exceptions import (
+    ProtocolError,
+    UnknownNodeError,
+    InvalidKeyError,
+    InvalidSignatureError,
+    InvalidTargetError
+)
 
 
 class ErrorType(StrEnum):
@@ -9,17 +16,9 @@ class ErrorType(StrEnum):
     InvalidSignature = "invalid_signature"
     InvalidTarget = "invalid_target"
 
-class ProtocolError(Exception):
-    error_type: ErrorType
-    
-class UnknownNodeError(ProtocolError):
-    error_type = ErrorType.UnknownNode
-    
-class InvalidKeyError(ProtocolError):
-    error_type = ErrorType.InvalidKey
-    
-class InvalidSignatureError(ProtocolError):
-    error_type = ErrorType.InvalidSignature
-
-class InvalidTargetError(ProtocolError):
-    error_type = ErrorType.InvalidTarget
+EXCEPTION_TO_ERROR_TYPE: dict[ProtocolError, ErrorType] = {
+    UnknownNodeError: ErrorType.UnknownNode,
+    InvalidKeyError: ErrorType.InvalidKey,
+    InvalidSignatureError: ErrorType.InvalidSignature,
+    InvalidTargetError: ErrorType.InvalidTarget
+}

src/koi_net/secure_manager.py

@@ -10,7 +10,7 @@
 from .protocol.event import EventType
 from .protocol.node import NodeProfile
 from .protocol.secure import PrivateKey
-from .protocol.errors import (
+from .exceptions import (
     UnknownNodeError,
     InvalidKeyError,
     InvalidSignatureError,