Merge branch 'main' into pdl-182

Author: mandel

tests/test_examples_parse.py

@@ -1,9 +1,6 @@
 import pathlib
 
-import pydantic
-import yaml
-
-from pdl.pdl_ast import Program
+from pdl.pdl_parser import PDLParseError, parse_file
 
 EXPECTED_INVALID = [
     pathlib.Path("tests") / "data" / "line" / "hello.pdl",
@@ -20,12 +17,10 @@
 def test_valid_programs() -> None:
     actual_invalid: set[str] = set()
     for yaml_file_name in pathlib.Path(".").glob("**/*.pdl"):
-        with open(yaml_file_name, "r", encoding="utf-8") as pdl_file:
-            try:
-                data = yaml.safe_load(pdl_file)
-                _ = Program.model_validate(data)
-            except pydantic.ValidationError:
-                actual_invalid |= {str(yaml_file_name)}
+        try:
+            _ = parse_file(yaml_file_name)
+        except PDLParseError:
+            actual_invalid |= {str(yaml_file_name)}
     expected_invalid = set(str(p) for p in EXPECTED_INVALID)
     unexpected_invalid = sorted(list(actual_invalid - expected_invalid))
     assert len(unexpected_invalid) == 0, unexpected_invalid

tests/test_examples_run.py

@@ -39,9 +39,11 @@
         pathlib.Path("examples") / "granite" / "single_round_chat.pdl",
         pathlib.Path("examples") / "joke" / "Joke.pdl",
         pathlib.Path("examples") / "react" / "multi-agent.pdl",
+        pathlib.Path("examples") / "react" / "wikipedia.pdl",
         pathlib.Path("examples") / "talk" / "11-sdg.pdl",
         pathlib.Path("examples") / "talk" / "7-chatbot-roles.pdl",
         pathlib.Path("examples") / "talk" / "8-tools.pdl",
+        pathlib.Path("examples") / "talk" / "9-react.pdl",
         pathlib.Path("examples") / "teacher" / "teacher.pdl",
         pathlib.Path("examples") / "tools" / "calc.pdl",
         pathlib.Path("examples") / "tutorial" / "include.pdl",