koi-net 1.1.0b6__py3-none-any.whl → 1.1.0b7__py3-none-any.whl

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/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/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/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/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)

{koi_net-1.1.0b6.dist-info → koi_net-1.1.0b7.dist-info}/METADATA

@@ -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.dist-info → koi_net-1.1.0b7.dist-info}/RECORD

@@ -8,13 +8,13 @@ koi_net/identity.py,sha256=FvIWksGTqwM7HCevIwmo_6l-t-2tnYkaaR4CanZatL4,569
 koi_net/lifecycle.py,sha256=GL2zltmh-aeBuNVg_rbIgsXMch672w7xkWAXCTjxst4,3550
 koi_net/poller.py,sha256=bIrlqdac5vLQYAid35xiQJLDMR85GnOSPCXSTQ07-Mc,1173
 koi_net/secure.py,sha256=cGNF2assqCaYq0i0fhQBm7aREoAdpY-XVypDsE1ALaU,3970
-koi_net/server.py,sha256=dZfSKrNHqIVD1qc9WkYRO30L4so-A7iW4IsX63oSmlE,4265
+koi_net/server.py,sha256=PrR_cXQV5YMKa6FXwiJXwMZJ52VQVzLPYYPVl-Miuw8,4315
 koi_net/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 koi_net/network/behavior.py,sha256=NZLvWlrxR0uWriE3ZzCXmocUVccQthy7Xx8E_8KBwsg,1208
 koi_net/network/error_handler.py,sha256=_dAl2ovpUZEVhPc8_dcLA7I-FoMNqQNwFy0QLa4uTSY,1617
 koi_net/network/event_queue.py,sha256=DWs26C235iYkP4koKcdbhmIOHGZRJ48d072BoNWyiHo,7325
 koi_net/network/graph.py,sha256=60SLiR3aNXIOGe-URzMGgx8abmMEJtz37EJs6jeImEM,4143
-koi_net/network/request_handler.py,sha256=vBXw2GO5vGAYCs18flWbln4kO_HmY1G9uuFu9MYqedY,6852
+koi_net/network/request_handler.py,sha256=_SM5MuYkS636wGJeFkesapQsW5x_kt_1o9KTXB0wksU,6869
 koi_net/network/resolver.py,sha256=coIp4M6k0-8sUfAy4h2NMx_7zCNroWlCHKOj3AXZVhc,5412
 koi_net/network/response_handler.py,sha256=__R_EvEpjaMz3PCDvkNgWF_EAHe2nePGk-zK_cT4C4g,2077
 koi_net/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,13 +26,13 @@ koi_net/processor/knowledge_pipeline.py,sha256=i7FpCFl0UIOwCI5zhP1i8M4PX4A48VN28
 koi_net/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 koi_net/protocol/api_models.py,sha256=jzRZWW_ZB5YsBAiwCom882-WIbr0rPyelJxExRgHZGc,1755
 koi_net/protocol/consts.py,sha256=bisbVEojPIHlLhkLafBzfIhH25TjNfvTORF1g6YXzIM,243
-koi_net/protocol/edge.py,sha256=dQKtI0_eX2E6tD7kMExv6DeJMkqNo2cY-LxJMJbiK0E,963
-koi_net/protocol/envelope.py,sha256=BkBabUZXDOiGJnfBJm5BHTQZflsiQ3jBmG1gNOtmeO4,1698
+koi_net/protocol/edge.py,sha256=PzdEhC43T1KO5iMSEu7I4tiz-7sZxtz41dJfWf-oHA0,1034
+koi_net/protocol/envelope.py,sha256=UVHlO2BDyDiP5eixqx9xD6xUsCfFRi0kZyzC4BC-DOw,1886
 koi_net/protocol/errors.py,sha256=uKPQ-TGLouZuK0xd2pXuCQoRTyu_JFsydSCLml13Cz8,595
-koi_net/protocol/event.py,sha256=eGgihEj1gliLoQRk8pVB2q_was0AGo-PbT3Hqnpn3oU,1379
+koi_net/protocol/event.py,sha256=HxzLN-iCXPyr2YzrswMIkgZYeUdFbBpa5v98dAB06lQ,1328
 koi_net/protocol/node.py,sha256=7GQzHORFr9cP4BqJgir6EGSWCskL-yqmvJksIiLfcWU,409
 koi_net/protocol/secure.py,sha256=6sRLWxG5EDF0QLBj29gk3hPmZnPXATrTTFdwx39wQfY,5127
-koi_net-1.1.0b6.dist-info/METADATA,sha256=G2VwaYEW0oLstoINlbOJlT-f2yAhSXEOZP3shspdgqo,37118
-koi_net-1.1.0b6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-koi_net-1.1.0b6.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
-koi_net-1.1.0b6.dist-info/RECORD,,
+koi_net-1.1.0b7.dist-info/METADATA,sha256=nHdoaFbZodVbTgjEuZeMxi8as2JOWP0Fyhoj05tn7e8,37118
+koi_net-1.1.0b7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+koi_net-1.1.0b7.dist-info/licenses/LICENSE,sha256=03mgCL5qth2aD9C3F3qNVs4sFJSpK9kjtYCyOwdSp7s,1069
+koi_net-1.1.0b7.dist-info/RECORD,,