[DATASOURCE]: Persistent data handler update

jaclang/__init__.py

@@ -6,6 +6,7 @@
     JacFeatureDefaults,
 )
 from jaclang.plugin.feature import JacFeature, pm  # noqa: E402
+from jaclang.runtimelib import architype  # noqa
 
 jac_import = JacFeature.jac_import
 

jaclang/cli/cli.py

@@ -2,14 +2,12 @@
 
 import ast as ast3
 import importlib
-import inspect
 import marshal
 import os
 import pickle
 import shutil
 import types
 from typing import Optional
-from uuid import UUID
 
 import jaclang.compiler.absyntree as ast
 from jaclang import jac_import
@@ -22,7 +20,7 @@
 from jaclang.plugin.builtin import dotgen
 from jaclang.plugin.feature import JacCmd as Cmd
 from jaclang.plugin.feature import JacFeature as Jac
-from jaclang.runtimelib.constructs import Architype
+from jaclang.runtimelib.constructs import Anchor, NodeAnchor, WalkerArchitype
 from jaclang.runtimelib.machine import JacProgram
 from jaclang.utils.helpers import debugger as db
 from jaclang.utils.lang_tools import AstTool
@@ -68,12 +66,7 @@ def format_file(filename: str) -> None:
 
 @cmd_registry.register
 def run(
-    filename: str,
-    session: str = "",
-    main: bool = True,
-    cache: bool = True,
-    walker: str = "",
-    node: str = "",
+    filename: str, session: str = "", main: bool = True, cache: bool = True
 ) -> None:
     """Run the specified .jac file."""
     # if no session specified, check if it was defined when starting the command shell
@@ -90,78 +83,49 @@ def run(
     base, mod = os.path.split(filename)
     base = base if base else "./"
     mod = mod[:-4]
-    Jac.context().init_memory(base_path=base, session=session)
+
+    ctx = Jac.new_context(base_path=base, session=session)
+
     if filename.endswith(".jac"):
-        ret_module = jac_import(
+        jac_import(
             target=mod,
             base_path=base,
             cachable=cache,
             override_name="__main__" if main else None,
         )
-        if ret_module is None:
-            loaded_mod = None
-        else:
-            (loaded_mod,) = ret_module
     elif filename.endswith(".jir"):
         with open(filename, "rb") as f:
             ir = pickle.load(f)
-            jac_program = JacProgram(mod_bundle=ir, bytecode=None)
-            Jac.context().jac_machine.attach_program(jac_program)
-            ret_module = jac_import(
+            ctx.jac_machine.attach_program(JacProgram(mod_bundle=ir, bytecode=None))
+            jac_import(
                 target=mod,
                 base_path=base,
                 cachable=cache,
                 override_name="__main__" if main else None,
             )
-            if ret_module is None:
-                loaded_mod = None
-            else:
-                (loaded_mod,) = ret_module
     else:
         print("Not a .jac file.")
         return
 
-    if not node or node == "root":
-        entrypoint: Architype = Jac.get_root()
-    else:
-        obj = Jac.context().get_obj(UUID(node))
-        if obj is None:
-            print(f"Entrypoint {node} not found.")
-            return
-        entrypoint = obj
-
-    # TODO: handle no override name
-    if walker:
-        walker_module = dict(inspect.getmembers(loaded_mod)).get(walker)
-        if walker_module:
-            Jac.spawn_call(entrypoint, walker_module())
-        else:
-            print(f"Walker {walker} not found.")
-
-    Jac.reset_context()
+    ctx.close()
 
 
 @cmd_registry.register
-def get_object(id: str, session: str = "") -> dict:
+def get_object(id: str, session: str = "") -> dict[str, object]:
     """Get the object with the specified id."""
     if session == "":
         session = cmd_registry.args.session if "session" in cmd_registry.args else ""
 
-    Jac.context().init_memory(session=session)
+    ctx = Jac.new_context(session=session)
 
+    response = {}
     if id == "root":
-        id_uuid = UUID(int=0)
-    else:
-        id_uuid = UUID(id)
+        response = ctx.root.__getstate__()
+    elif (anchor := Anchor.ref(id)) and (architype := anchor.sync()):
+        response = architype.__jac__.__getstate__()
 
-    obj = Jac.context().get_obj(id_uuid)
-    if obj is None:
-        print(f"Object with id {id} not found.")
-        Jac.reset_context()
-        return {}
-    else:
-        Jac.reset_context()
-        return obj.__getstate__()
+    ctx.close()
+    return response
 
 
 @cmd_registry.register
@@ -211,13 +175,27 @@ def lsp() -> None:
 
 
 @cmd_registry.register
-def enter(filename: str, entrypoint: str, args: list) -> None:
-    """Run the specified entrypoint function in the given .jac file.
+def enter(
+    filename: str,
+    session: str = "",
+    entrypoint: str = "",
+    root: str = "",
+    node: str = "",
+    args: Optional[list] = None,
+) -> None:
+    """
+    Run the specified entrypoint function in the given .jac file.
 
     :param filename: The path to the .jac file.
     :param entrypoint: The name of the entrypoint function.
+    :param root: root executor.
+    :param node: starting node if entrypoint is walker.
     :param args: Arguments to pass to the entrypoint function.
     """
+    ctx = Jac.new_context(
+        session=session, root=NodeAnchor.ref(root), entry=NodeAnchor.ref(node)
+    )
+
     if filename.endswith(".jac"):
         base, mod_name = os.path.split(filename)
         base = base if base else "./"
@@ -227,10 +205,19 @@ def enter(filename: str, entrypoint: str, args: list) -> None:
             print("Errors occurred while importing the module.")
             return
         else:
-            getattr(mod, entrypoint)(*args)
+            result = getattr(mod, entrypoint)(*args or [])
+            if (
+                isinstance(result, WalkerArchitype)
+                and ctx.validate_access()
+                and (architype := ctx.entry.architype)
+            ):
+                Jac.spawn_call(architype, result)
+
     else:
         print("Not a .jac file.")
 
+    ctx.close()
+
 
 @cmd_registry.register
 def test(
@@ -252,6 +239,8 @@ def test(
 
     jac test => jac test -d .
     """
+    ctx = Jac.new_context()
+
     failcount = Jac.run_test(
         filepath=filepath,
         filter=filter,
@@ -260,6 +249,9 @@ def test(
         directory=directory,
         verbose=verbose,
     )
+
+    ctx.close()
+
     if failcount:
         raise SystemExit(f"Tests failed: {failcount}")
 
@@ -361,7 +353,9 @@ def dot(
     base, mod = os.path.split(filename)
     base = base if base else "./"
     mod = mod[:-4]
-    Jac.context().init_memory(base_path=base, session=session)
+
+    ctx = Jac.new_context(base_path=base, session=session)
+
     if filename.endswith(".jac"):
         jac_import(
             target=mod,
@@ -380,21 +374,20 @@ def dot(
                 edge_limit=edge_limit,
                 node_limit=node_limit,
             )
+
+            file_name = saveto if saveto else f"{mod}.dot"
+            with open(file_name, "w") as file:
+                file.write(graph)
+            print(f">>> Graph content saved to {os.path.join(os.getcwd(), file_name)}")
         except Exception as e:
             print(f"Error while generating graph: {e}")
             import traceback
 
             traceback.print_exc()
-            Jac.reset_context()
-            return
-        file_name = saveto if saveto else f"{mod}.dot"
-        with open(file_name, "w") as file:
-            file.write(graph)
-        print(f">>> Graph content saved to {os.path.join(os.getcwd(), file_name)}")
     else:
         print("Not a .jac file.")
 
-    Jac.reset_context()
+    ctx.close()
 
 
 @cmd_registry.register

jaclang/compiler/constant.py

@@ -1,6 +1,11 @@
 """Constants across the project."""
 
 from enum import Enum, IntEnum, IntFlag, StrEnum
+from typing import ParamSpec, TypeVar
+
+
+T = TypeVar("T")
+P = ParamSpec("P")
 
 
 class SymbolType(Enum):
@@ -94,18 +99,18 @@ class Constants(StrEnum):
     HERE = "_jac_here_"
     JAC_FEATURE = "_Jac"
     ROOT = f"{JAC_FEATURE}.get_root()"
-    EDGES_TO_NODE = "_jac_.edges_to_nodes"
-    EDGE_REF = "_jac_.edge_ref"
-    CONNECT_NODE = "_jac_.connect_node"
-    DISCONNECT_NODE = "_jac_.disconnect_node"
-    WALKER_VISIT = "_jac_.visit_node"
-    WALKER_IGNORE = "_jac_.ignore_node"
-    DISENGAGE = "_jac_.disengage_now"
+    EDGES_TO_NODE = "__jac__.edges_to_nodes"
+    EDGE_REF = "__jac__.edge_ref"
+    CONNECT_NODE = "__jac__.connect_node"
+    DISCONNECT_NODE = "__jac__.disconnect_node"
+    WALKER_VISIT = "__jac__.visit_node"
+    WALKER_IGNORE = "__jac__.ignore_node"
+    DISENGAGE = "__jac__.disengage_now"
     OBJECT_CLASS = "_jac_Object_"
     NODE_CLASS = "_jac_Node_"
     EDGE_CLASS = "_jac_Edge_"
     WALKER_CLASS = "_jac_Walker_"
-    WITH_DIR = "_jac_.apply_dir"
+    WITH_DIR = "__jac__.apply_dir"
     EDGE_DIR = "_jac_Edge_Dir"
     ON_ENTRY = "_jac_ds_.on_entry"
     ON_EXIT = "_jac_ds_.on_exit"