Test dumper when running the examples

Author: mandel

tests/test_dump.py

@@ -1,21 +1,24 @@
 import pathlib
 
+from pdl.pdl_ast import BlockType, IncludeBlock
 from pdl.pdl_ast_utils import iter_block_children
 from pdl.pdl_dumper import dump_yaml, program_to_dict
 from pdl.pdl_parser import PDLParseError, parse_file, parse_str
-from pdl.pdl_ast import BlockType, IncludeBlock
+
 
 def has_include(block: BlockType) -> bool:
     if isinstance(block, IncludeBlock):
         return True
-    else:
-        b = False
-        def f(x):
-            nonlocal b
-            if has_include(x):
-                b = True
-        iter_block_children(f,block)
-        return b
+    b = False
+
+    def f(x):
+        nonlocal b
+        if has_include(x):
+            b = True
+
+    iter_block_children(f, block)
+    return b
+
 
 def test_ast_iterators() -> None:
     for yaml_file_name in pathlib.Path(".").glob("**/*.pdl"):
@@ -28,8 +31,6 @@ def test_ast_iterators() -> None:
             ast2, _ = parse_str(s)
             json1 = ast1.model_dump_json()
             json2 = ast2.model_dump_json()
-            if str(yaml_file_name) == "examples/talk/7-chatbot-roles.pdl":
-                pass
             assert json1 == json2, yaml_file_name
         except PDLParseError:
             pass

tests/test_examples_run.py

@@ -8,6 +8,7 @@
 
 from pdl import pdl
 from pdl.pdl_ast import ScopeType
+from pdl.pdl_dumper import block_to_dict
 from pdl.pdl_interpreter import PDLRuntimeError
 from pdl.pdl_parser import PDLParseError
 
@@ -169,7 +170,9 @@ def test_valid_programs(capsys: CaptureFixture[str], monkeypatch: MonkeyPatch) -
                 scope = inputs.scope
         try:
             random.seed(11)
-            result = pdl.exec_file(pdl_file_name, scope=scope)
+            output = pdl.exec_file(pdl_file_name, scope=scope, output="all")
+            result = output["result"]
+            block_to_dict(output["trace"], json_compatible=True)
             result_dir_name = (
                 pathlib.Path(".") / "tests" / "results" / pdl_file_name.parent
             )