jaclang 0.7.26__tar.gz → 0.7.27__tar.gz

{jaclang-0.7.26 → jaclang-0.7.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaclang
-Version: 0.7.26
+Version: 0.7.27
 Summary: Jac is a unique and powerful programming language that runs on top of Python, offering an unprecedented level of intelligence and intuitive understanding.
 Home-page: https://jaseci.org
 License: MIT

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/plugin/default.py

@@ -51,6 +51,20 @@ hookimpl = pluggy.HookimplMarker("jac")
 logger = getLogger(__name__)
 
 
+class JacCallableImplementation:
+    """Callable Implementations."""
+
+    @staticmethod
+    def get_object(id: str) -> Architype | None:
+        """Get object by id."""
+        if id == "root":
+            return Jac.get_context().root.architype
+        elif obj := Jac.get_context().mem.find_by_id(UUID(id)):
+            return obj.architype
+
+        return None
+
+
 class JacAccessValidationImpl:
     """Jac Access Validation Implementations."""
 
@@ -599,14 +613,9 @@ class JacFeatureImpl(
 
     @staticmethod
     @hookimpl
-    def get_object(id: str) -> Architype | None:
-        """Get object by id."""
-        if id == "root":
-            return Jac.get_context().root.architype
-        elif obj := Jac.get_context().mem.find_by_id(UUID(id)):
-            return obj.architype
-
-        return None
+    def get_object_func() -> Callable[[str], Architype | None]:
+        """Get object by id func."""
+        return JacCallableImplementation.get_object
 
     @staticmethod
     @hookimpl

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/plugin/feature.py

@@ -267,7 +267,12 @@ class JacFeature(
     @staticmethod
     def get_object(id: str) -> Architype | None:
         """Get object given id."""
-        return plugin_manager.hook.get_object(id=id)
+        return plugin_manager.hook.get_object_func()(id=id)
+
+    @staticmethod
+    def get_object_func() -> Callable[[str], Architype | None]:
+        """Get object given id."""
+        return plugin_manager.hook.get_object_func()
 
     @staticmethod
     def object_ref(obj: Architype) -> str:

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/plugin/spec.py

@@ -258,8 +258,8 @@ class JacFeatureSpec(
 
     @staticmethod
     @hookspec(firstresult=True)
-    def get_object(id: str) -> Architype | None:
-        """Get object by id."""
+    def get_object_func() -> Callable[[str], Architype | None]:
+        """Get object by id func."""
         raise NotImplementedError
 
     @staticmethod

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/plugin/tests/fixtures/other_root_access.jac

@@ -23,6 +23,16 @@ walker update_node {
     }
 }
 
+walker update_target_node {
+    has val: int;
+    has node_id: str;
+
+    can enter with `root entry {
+        target_node = &(self.node_id);
+        target_node.val = self.val;
+    }
+}
+
 walker update_node_forced {
     has val: int;
 

jaclang-0.7.27/jaclang/plugin/tests/fixtures/savable_object.jac

@@ -0,0 +1,84 @@
+enum Enum {
+    A = "a",
+    B = "b",
+    C = "c"
+}
+
+obj Child {
+    has val: int, arr: list[int], json: dict[str, int], enum_field: Enum;
+}
+
+obj Parent:Child: {
+    has child: Child;
+}
+
+obj SavableObject {
+    has val: int, arr: list[int], json: dict[str, int], parent: Parent, enum_field: Enum;
+}
+
+walker create_custom_object {
+    can enter1 with `root entry {
+        o = SavableObject(
+            val=0,
+            arr=[],
+            json={},
+            parent=Parent(
+                val=1,
+                arr=[1],
+                json={"a": 1},
+                child=Child(
+                    val=2,
+                    arr=[1, 2],
+                    json={"a": 1, "b": 2},
+                    enum_field = Enum.C
+                ),
+                enum_field = Enum.B
+            ),
+            enum_field = Enum.A
+        );
+        Jac.save(o);
+        print(jid(o));
+        print(o);
+    }
+}
+
+walker get_custom_object {
+    has object_id: str;
+
+    can enter1 with `root entry {
+        try {
+            print(&(self.object_id));
+        } except Exception as e {
+            print(None);
+        }
+    }
+}
+
+walker update_custom_object {
+    has object_id: str;
+
+    can enter1 with `root entry {
+        savable_object = &(self.object_id);
+        savable_object.parent.child.json["c"] = 3;
+        savable_object.parent.child.arr.append(3);
+        savable_object.parent.child.val = 3;
+        savable_object.parent.child.enum_field = Enum.A;
+        savable_object.parent.json["b"] = 2;
+        savable_object.parent.arr.append(2);
+        savable_object.parent.val = 2;
+        savable_object.parent.enum_field = Enum.C;
+        savable_object.json["a"] = 1;
+        savable_object.arr.append(1);
+        savable_object.val = 1;
+        savable_object.enum_field = Enum.B;
+        print(savable_object);
+    }
+}
+
+walker delete_custom_object {
+    has object_id: str;
+
+    can enter1 with `root entry {
+        Jac.destroy(&(self.object_id));
+    }
+}

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/plugin/tests/test_jaseci.py

@@ -385,6 +385,22 @@ class TestJaseciPlugin(TestCase):
             node=self.nodes[0],
         )
 
+        cli.enter(
+            filename=self.fixture_abs_path("other_root_access.jac"),
+            entrypoint="update_target_node",
+            args=[20, self.nodes[1]],
+            session=session,
+            root=self.roots[0],
+        )
+
+        cli.enter(
+            filename=self.fixture_abs_path("other_root_access.jac"),
+            entrypoint="update_target_node",
+            args=[10, self.nodes[0]],
+            session=session,
+            root=self.roots[1],
+        )
+
         cli.enter(
             filename=self.fixture_abs_path("other_root_access.jac"),
             entrypoint="check_node",
@@ -728,3 +744,75 @@ class TestJaseciPlugin(TestCase):
         )
 
         self._del_session(session)
+
+    def test_savable_object(self) -> None:
+        """Test ObjectAnchor save."""
+        global session
+        session = self.fixture_abs_path("other_root_access.session")
+
+        self._output2buffer()
+
+        cli.enter(
+            filename=self.fixture_abs_path("savable_object.jac"),
+            entrypoint="create_custom_object",
+            args=[],
+            session=session,
+        )
+
+        prints = self.capturedOutput.getvalue().strip().split("\n")
+        id = prints[0]
+
+        self.assertEqual(
+            "SavableObject(val=0, arr=[], json={}, parent=Parent(val=1, arr=[1], json"
+            "={'a': 1}, enum_field=<Enum.B: 'b'>, child=Child(val=2, arr=[1, 2], json"
+            "={'a': 1, 'b': 2}, enum_field=<Enum.C: 'c'>)), enum_field=<Enum.A: 'a'>)",
+            prints[1],
+        )
+
+        self._output2buffer()
+
+        cli.enter(
+            filename=self.fixture_abs_path("savable_object.jac"),
+            entrypoint="get_custom_object",
+            args=[id],
+            session=session,
+        )
+        self.assertEqual(
+            "SavableObject(val=0, arr=[], json={}, parent=Parent(val=1, arr=[1], json"
+            "={'a': 1}, enum_field=<Enum.B: 'b'>, child=Child(val=2, arr=[1, 2], json"
+            "={'a': 1, 'b': 2}, enum_field=<Enum.C: 'c'>)), enum_field=<Enum.A: 'a'>)",
+            self.capturedOutput.getvalue().strip(),
+        )
+
+        self._output2buffer()
+
+        cli.enter(
+            filename=self.fixture_abs_path("savable_object.jac"),
+            entrypoint="update_custom_object",
+            args=[id],
+            session=session,
+        )
+
+        self.assertEqual(
+            "SavableObject(val=1, arr=[1], json={'a': 1}, parent=Parent(val=2, arr=[1, 2], json"
+            "={'a': 1, 'b': 2}, enum_field=<Enum.C: 'c'>, child=Child(val=3, arr=[1, 2, 3], json"
+            "={'a': 1, 'b': 2, 'c': 3}, enum_field=<Enum.A: 'a'>)), enum_field=<Enum.B: 'b'>)",
+            self.capturedOutput.getvalue().strip(),
+        )
+
+        self._output2buffer()
+
+        cli.enter(
+            filename=self.fixture_abs_path("savable_object.jac"),
+            entrypoint="delete_custom_object",
+            args=[id],
+            session=session,
+        )
+
+        cli.enter(
+            filename=self.fixture_abs_path("savable_object.jac"),
+            entrypoint="get_custom_object",
+            args=[id],
+            session=session,
+        )
+        self.assertEqual("None", self.capturedOutput.getvalue().strip())

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/runtimelib/architype.py

@@ -226,6 +226,13 @@ class WalkerAnchor(Anchor):
     disengaged: bool = False
 
 
+@dataclass(eq=False, repr=False, kw_only=True)
+class ObjectAnchor(Anchor):
+    """Edge Anchor."""
+
+    architype: ObjectArchitype
+
+
 class Architype:
     """Architype Protocol."""
 
@@ -267,6 +274,16 @@ class WalkerArchitype(Architype):
         self.__jac__ = WalkerAnchor(architype=self)
 
 
+class ObjectArchitype(Architype):
+    """Walker Architype Protocol."""
+
+    __jac__: ObjectAnchor
+
+    def __init__(self) -> None:
+        """Create walker architype."""
+        self.__jac__ = ObjectAnchor(architype=self)
+
+
 @dataclass(eq=False)
 class GenericEdge(EdgeArchitype):
     """Generic Root Node."""

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/runtimelib/memory.py

@@ -84,14 +84,32 @@ class ShelfStorage(Memory[UUID, Anchor]):
     def close(self) -> None:
         """Close memory handler."""
         if isinstance(self.__shelf__, Shelf):
-            from jaclang.plugin.feature import JacFeature as Jac
-
             for anchor in self.__gc__:
                 self.__shelf__.pop(str(anchor.id), None)
                 self.__mem__.pop(anchor.id, None)
 
-            for d in self.__mem__.values():
-                if d.persistent and d.hash != hash(dumps(d)):
+            keys = set(self.__mem__.keys())
+
+            # current memory
+            self.sync_mem_to_db(keys)
+
+            # additional after memory sync
+            self.sync_mem_to_db(set(self.__mem__.keys() - keys))
+
+            self.__shelf__.close()
+        super().close()
+
+    def sync_mem_to_db(self, keys: Iterable[UUID]) -> None:
+        """Manually sync memory to db."""
+        from jaclang.plugin.feature import JacFeature as Jac
+
+        if isinstance(self.__shelf__, Shelf):
+            for key in keys:
+                if (
+                    (d := self.__mem__.get(key))
+                    and d.persistent
+                    and d.hash != hash(dumps(d))
+                ):
                     _id = str(d.id)
                     if p_d := self.__shelf__.get(_id):
                         if (
@@ -119,9 +137,6 @@ class ShelfStorage(Memory[UUID, Anchor]):
                     ):
                         self.__shelf__[_id] = d
 
-            self.__shelf__.close()
-        super().close()
-
     def find(
         self,
         ids: UUID | Iterable[UUID],

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/runtimelib/utils.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import ast as ast3
 import sys
 from contextlib import contextmanager
+from types import UnionType
 from typing import Callable, Iterator, TYPE_CHECKING
 
 import jaclang.compiler.absyntree as ast
@@ -215,3 +216,18 @@ def extract_params(
                             )
                             exclude_info.append((var_name, i.gen.py_ast[0]))
     return model_params, include_info, exclude_info
+
+
+def is_instance(
+    obj: object, target: type | UnionType | tuple[type | UnionType, ...]
+) -> bool:
+    """Check if object is instance of target type."""
+    match target:
+        case UnionType():
+            return any((is_instance(obj, trg) for trg in target.__args__))
+        case tuple():
+            return any((is_instance(obj, trg) for trg in target))
+        case type():
+            return isinstance(obj, target)
+        case _:
+            return False

{jaclang-0.7.26 → jaclang-0.7.27}/jaclang/tests/test_language.py

@@ -117,10 +117,9 @@ class JacLanguageTests(TestCase):
         sys.stdout = sys.__stdout__
         stdout_value = captured_output.getvalue()
 
-        # print(arr[1:3, 1::2]);
         expected_outputs = [
-            "+-- AtomTrailer - Type: Any",
-            "    +-- Name - arr - Type: Any,  SymbolTable: None",
+            "+-- AtomTrailer - Type: numpy.ndarray[Any, numpy.dtype[Any]]",
+            "    +-- Name - arr - Type: numpy.ndarray[Any, numpy.dtype[Any]],  SymbolTable: None",
             "    +-- IndexSlice - [IndexSlice] - Type: builtins.slice,  SymbolTable: None",
             "        +-- Token - [,",
             "        +-- Int - 1 - Type: Literal[1]?,  SymbolTable: None",

{jaclang-0.7.26 → jaclang-0.7.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jaclang"
-version = "0.7.26"
+version = "0.7.27"
 description = "Jac is a unique and powerful programming language that runs on top of Python, offering an unprecedented level of intelligence and intuitive understanding."
 authors = ["Jason Mars <jason@jaseci.org>"]
 maintainers = ["Jason Mars <jason@jaseci.org>"]