Merge pull request #600 from Jaseci-Labs/dot_edge_attr

Enhance the dot view by displaying edge attributes.
Jaseci-Labs · Sep 3, 2024 · 13a4dda · 13a4dda
2 parents 9690cf9 + f15b772
commit 13a4dda
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/jaclang/plugin/default.py b/jaclang/plugin/default.py
@@ -903,7 +903,7 @@ def dfs(node: NodeArchitype, cur_depth: int) -> None:
         for source, target, edge in connections:
             dot_content += (
                 f"{visited_nodes.index(source)} -> {visited_nodes.index(target)} "
-                f' [label="{html.escape(str(edge.__jac__.architype.__class__.__name__))} "];\n'
+                f' [label="{html.escape(str(edge.__jac__.architype))} "];\n'
             )
         for node_ in visited_nodes:
             color = (

diff --git a/jaclang/tests/fixtures/builtin_dotgen.jac b/jaclang/tests/fixtures/builtin_dotgen.jac
@@ -31,6 +31,7 @@ with entry{
     print(d2.count('a(val')==19,d2.count('#F5E5FF')==2 ,'Edge1' not in d2,d2.count('GenericEdge')==42);
     print(d3.count('a(val')==6,d3.count("GenericEdge")==5,d3.count('#F5E5FF')==1);
     print(d4.count("a(val")==25,d4.count("GenericEdge")==66,d4.count('#FFF0F')==3);
+    print(d5.count("Edge1(val=6)")==2, d5.count("GenericEdge()")==24);
     # print(l3<l2);
     # print(d1);
     # print(d2);

diff --git a/jaclang/tests/test_language.py b/jaclang/tests/test_language.py
@@ -376,7 +376,7 @@ def test_gen_dot_builtin(self) -> None:
         jac_import("builtin_dotgen", base_path=self.fixture_abs_path("./"))
         sys.stdout = sys.__stdout__
         stdout_value = captured_output.getvalue()
-        self.assertEqual(stdout_value.count("True"), 14)
+        self.assertEqual(stdout_value.count("True"), 16)
 
     def test_with_contexts(self) -> None:
         """Test walking through edges."""