koi-net 1.1.0b6__tar.gz → 1.1.0b7__tar.gz

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koi-net
-Version: 1.1.0b6
+Version: 1.1.0b7
 Summary: Implementation of KOI-net protocol in Python
 Project-URL: Homepage, https://github.com/BlockScience/koi-net/
 Author-email: Luke Miller <luke@block.science>

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/pyproject.toml

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

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/src/koi_net/network/request_handler.py

@@ -119,7 +119,7 @@ class RequestHandler:
         )
         
         try:
-            result = httpx.post(url, data=signed_envelope.model_dump_json())
+            result = httpx.post(url, data=signed_envelope.model_dump_json(exclude_none=True))
         except httpx.ConnectError as err:
             logger.debug("Failed to connect")
             self.error_handler.handle_connection_error(node)

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/src/koi_net/protocol/edge.py

@@ -2,6 +2,7 @@ from enum import StrEnum
 from pydantic import BaseModel
 from rid_lib import RIDType
 from rid_lib.ext.bundle import Bundle
+from rid_lib.ext.utils import sha256_hash
 from rid_lib.types import KoiNetEdge, KoiNetNode
 
 
@@ -27,7 +28,9 @@ def generate_edge_bundle(
     rid_types: list[RIDType],
     edge_type: EdgeType
 ) -> Bundle:
-    edge_rid = KoiNetEdge.generate(source, target)
+    edge_rid = KoiNetEdge(sha256_hash(
+        str(source) + str(target)
+    ))
     edge_profile = EdgeProfile(
         source=source,
         target=target,

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/src/koi_net/protocol/envelope.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Generic, TypeVar
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from rid_lib.types import KoiNetNode
 
 from .secure import PrivateKey, PublicKey
@@ -13,6 +13,8 @@ logger = logging.getLogger(__name__)
 T = TypeVar("T", bound=RequestModels | ResponseModels)
 
 class SignedEnvelope(BaseModel, Generic[T]):
+    model_config = ConfigDict(exclude_none=True)
+    
     payload: T
     source_node: KoiNetNode
     target_node: KoiNetNode
@@ -26,24 +28,26 @@ class SignedEnvelope(BaseModel, Generic[T]):
             target_node=self.target_node 
         )
         
-        logger.debug(f"Verifying envelope: {unsigned_envelope.model_dump_json()}")
+        logger.debug(f"Verifying envelope: {unsigned_envelope.model_dump_json(exclude_none=True)}")
                 
         pub_key.verify(
             self.signature,
-            unsigned_envelope.model_dump_json().encode()
+            unsigned_envelope.model_dump_json(exclude_none=True).encode()
         )
 
 class UnsignedEnvelope(BaseModel, Generic[T]):
+    model_config = ConfigDict(exclude_none=True)
+    
     payload: T
     source_node: KoiNetNode
     target_node: KoiNetNode
     
     def sign_with(self, priv_key: PrivateKey) -> SignedEnvelope[T]:
-        logger.debug(f"Signing envelope: {self.model_dump_json()}")
+        logger.debug(f"Signing envelope: {self.model_dump_json(exclude_none=True)}")
         logger.debug(f"Type: [{type(self.payload)}]")
         
         signature = priv_key.sign(
-            self.model_dump_json().encode()
+            self.model_dump_json(exclude_none=True).encode()
         )
         
         return SignedEnvelope(

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/src/koi_net/protocol/event.py

@@ -15,9 +15,6 @@ class Event(BaseModel):
     manifest: Manifest | None = None
     contents: dict | None = None
     
-    class Config:
-        exclude_none = True
-    
     def __repr__(self):
         return f"<Event '{self.rid}' event type: '{self.event_type}'>"
     

{koi_net-1.1.0b6 → koi_net-1.1.0b7}/src/koi_net/server.py

@@ -73,7 +73,8 @@ class NodeServer:
             self.router.add_api_route(
                 path=path,
                 endpoint=self.secure.envelope_handler(func),
-                methods=["POST"]
+                methods=["POST"],
+                response_model_exclude_none=True
             )
         
         _add_endpoint(BROADCAST_EVENTS_PATH, self.broadcast_events)