more compatibility changes for typescript compatibility. edge hash now created by concatenating source and target strings, null values excluded from payload.

Author: lukvmil

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 = "[email protected]"}

src/koi_net/protocol/edge.py

@@ -2,6 +2,7 @@
 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,

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 @@
 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
@@ -30,10 +32,12 @@ def verify_with(self, pub_key: PublicKey):
 
         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
@@ -43,7 +47,7 @@ def sign_with(self, priv_key: PrivateKey) -> SignedEnvelope[T]:
         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(

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}'>"