[REFACTOR]: Realign saving for proper handling

Author: amadolid

jaclang/core/architype.py

@@ -5,12 +5,12 @@
 from dataclasses import asdict, dataclass, field, is_dataclass
 from enum import Enum
 from os import getenv
-from pickle import dumps
 from re import IGNORECASE, compile
 from types import UnionType
 from typing import (
     Any,
     Callable,
+    ClassVar,
     Generic,
     Iterable,
     Optional,
@@ -21,7 +21,7 @@
 
 from jaclang.compiler.constant import EdgeDir, T
 from jaclang.core.utils import collect_node_connections
-
+from jaclang.vendor.orjson import dumps
 
 GENERIC_ID_REGEX = compile(
     r"^(g|n|e|w):([^:]*):([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$",
@@ -43,7 +43,7 @@
 TA = TypeVar("TA", bound="type[Architype]")
 
 
-class ObjectType(Enum):
+class AnchorType(Enum):
     """Enum For Anchor Types."""
 
     generic = "g"
@@ -143,7 +143,7 @@ def deserialize(cls, data: dict[str, Any]) -> Permission:
 class Anchor:
     """Object Anchor."""
 
-    type: ObjectType = ObjectType.generic
+    type: ClassVar[AnchorType] = AnchorType.generic
     name: str = ""
     id: UUID = field(default_factory=uuid4)
     root: Optional[UUID] = None
@@ -164,21 +164,34 @@ def ref(ref_id: str) -> Optional[Anchor]:
         """Return ObjectAnchor instance if ."""
         if matched := GENERIC_ID_REGEX.search(ref_id):
             cls: type = Anchor
-            match ObjectType(matched.group(1)):
-                case ObjectType.node:
+            match AnchorType(matched.group(1)):
+                case AnchorType.node:
                     cls = NodeAnchor
-                case ObjectType.edge:
+                case AnchorType.edge:
                     cls = EdgeAnchor
-                case ObjectType.walker:
+                case AnchorType.walker:
                     cls = WalkerAnchor
                 case _:
                     pass
             return cls(name=matched.group(2), id=UUID(matched.group(3)))
         return None
 
+    def _save(self) -> None:
+        """Save Anchor."""
+        raise NotImplementedError("_save must be implemented in subclasses")
+
     def save(self) -> None:
         """Save Anchor."""
-        raise NotImplementedError("save must be implemented in subclasses")
+        if self.architype:
+            if not self.connected:
+                self.connected = True
+                self.sync_hash()
+                self._save()
+            elif self.current_access_level == 0 and self.hash != (
+                _hash := self.data_hash()
+            ):
+                self.hash = _hash
+                self._save()
 
     def destroy(self) -> None:
         """Save Anchor."""
@@ -284,6 +297,14 @@ def serialize(self) -> dict[str, object]:
             ),
         }
 
+    def data_hash(self) -> int:
+        """Get current serialization hash."""
+        return hash(dumps(self.serialize()))
+
+    def sync_hash(self) -> None:
+        """Sync current serialization hash."""
+        self.hash = self.data_hash()
+
     def report(self) -> dict[str, object]:
         """Report Anchor."""
         return {
@@ -319,7 +340,7 @@ def __eq__(self, other: object) -> bool:
 class NodeAnchor(Anchor):
     """Node Anchor."""
 
-    type: ObjectType = ObjectType.node
+    type: ClassVar[AnchorType] = AnchorType.node
     architype: Optional[NodeArchitype] = None
     edges: list[EdgeAnchor] = field(default_factory=list)
 
@@ -343,19 +364,6 @@ def _save(self) -> None:
 
         jsrc.set(self)
 
-    def save(self) -> None:
-        """Save Anchor."""
-        if self.architype:
-            if not self.connected:
-                self.connected = True
-                self.hash = hash(dumps(self))
-                self._save()
-            elif self.current_access_level > 0 and self.hash != (
-                _hash := hash(dumps(self))
-            ):
-                self.hash = _hash
-                self._save()
-
     def destroy(self) -> None:
         """Delete Anchor."""
         if self.architype and self.current_access_level > 1:
@@ -483,7 +491,7 @@ def serialize(self) -> dict[str, object]:
 class EdgeAnchor(Anchor):
     """Edge Anchor."""
 
-    type: ObjectType = ObjectType.edge
+    type: ClassVar[AnchorType] = AnchorType.edge
     architype: Optional[EdgeArchitype] = None
     source: Optional[NodeAnchor] = None
     target: Optional[NodeAnchor] = None
@@ -512,19 +520,6 @@ def _save(self) -> None:
 
         jsrc.set(self)
 
-    def save(self) -> None:
-        """Save Anchor."""
-        if self.architype:
-            if not self.connected:
-                self.connected = True
-                self.hash = hash(dumps(self))
-                self._save()
-            elif self.current_access_level == 1 and self.hash != (
-                _hash := hash(dumps(self))
-            ):
-                self.hash = _hash
-                self._save()
-
     def destroy(self) -> None:
         """Delete Anchor."""
         if self.architype and self.current_access_level == 1:
@@ -588,7 +583,7 @@ def serialize(self) -> dict[str, object]:
 class WalkerAnchor(Anchor):
     """Walker Anchor."""
 
-    type: ObjectType = ObjectType.walker
+    type: ClassVar[AnchorType] = AnchorType.walker
     architype: Optional[WalkerArchitype] = None
     path: list[Anchor] = field(default_factory=list)
     next: list[Anchor] = field(default_factory=list)
@@ -611,19 +606,6 @@ def _save(self) -> None:
 
         ExecutionContext.get().datasource.set(self)
 
-    def save(self) -> None:
-        """Save Anchor."""
-        if self.architype:
-            if not self.connected:
-                self.connected = True
-                self.hash = hash(dumps(self))
-                self._save()
-            elif self.current_access_level > 1 and self.hash != (
-                _hash := hash(dumps(self))
-            ):
-                self.hash = _hash
-                self._save()
-
     def destroy(self) -> None:
         """Delete Anchor."""
         if self.architype and self.current_access_level > 1:

jaclang/core/memory.py

@@ -8,13 +8,13 @@
 
 from .architype import (
     Anchor,
+    AnchorType,
     Architype,
     EdgeAnchor,
     EdgeArchitype,
     MANUAL_SAVE,
     NodeAnchor,
     NodeArchitype,
-    ObjectType,
     Permission,
     WalkerAnchor,
     WalkerArchitype,
@@ -160,8 +160,8 @@ def get(self, anchor: dict[str, Any]) -> Anchor:
         architype = anchor.pop("architype")
         access = Permission.deserialize(anchor.pop("access"))
 
-        match ObjectType(anchor.pop("type")):
-            case ObjectType.node:
+        match AnchorType(anchor.pop("type")):
+            case AnchorType.node:
                 nanch = NodeAnchor(
                     edges=[
                         e for edge in anchor.pop("edges") if (e := EdgeAnchor.ref(edge))
@@ -173,8 +173,9 @@ def get(self, anchor: dict[str, Any]) -> Anchor:
                 nanch.architype = NodeArchitype.get(name or "Root")(
                     __jac__=nanch, **architype
                 )
+                nanch.sync_hash()
                 return nanch
-            case ObjectType.edge:
+            case AnchorType.edge:
                 eanch = EdgeAnchor(
                     source=NodeAnchor.ref(anchor.pop("source")),
                     target=NodeAnchor.ref(anchor.pop("target")),
@@ -185,12 +186,15 @@ def get(self, anchor: dict[str, Any]) -> Anchor:
                 eanch.architype = EdgeArchitype.get(name or "GenericEdge")(
                     __jac__=eanch, **architype
                 )
+                eanch.sync_hash()
                 return eanch
-            case ObjectType.walker:
+            case AnchorType.walker:
                 wanch = WalkerAnchor(access=access, connected=True, **anchor)
                 wanch.architype = WalkerArchitype.get(name)(__jac__=wanch, **architype)
+                wanch.sync_hash()
                 return wanch
             case _:
                 oanch = Anchor(access=access, connected=True, **anchor)
                 oanch.architype = Architype(__jac__=oanch)
+                oanch.sync_hash()
                 return oanch

jaclang/vendor/orjson-3.10.6.dist-info/INSTALLER

@@ -0,0 +1 @@
+pip