Remove dependency to strictyaml

Author: mandel

pyproject.toml

@@ -16,7 +16,6 @@ dependencies = [
   "litellm~=1.49",
   "termcolor~=2.0",
   "ipython~=8.0",
-  "strictyaml~=1.7.3"
 ]
 authors = [
   { name="Mandana Vaziri", email="[email protected]" },

src/pdl/pdl-schema.json

@@ -1362,8 +1362,9 @@
             {
               "$ref": "#/$defs/BamTextGenerationParameters"
             },
+            {},
             {
-              "type": "object"
+              "$ref": "#/$defs/LocalizedExpression"
             },
             {
               "type": "null"
@@ -9302,8 +9303,9 @@
             {
               "$ref": "#/$defs/LitellmParameters"
             },
+            {},
             {
-              "type": "object"
+              "$ref": "#/$defs/LocalizedExpression"
             },
             {
               "type": "null"

src/pdl/pdl_ast.py

@@ -4,7 +4,6 @@
 from enum import StrEnum
 from typing import Any, Literal, Optional, Sequence, TypeAlias, Union
 
-import strictyaml
 from genai.schema import (
     DecodingMethod,
     ModerationParameters,
@@ -51,8 +50,6 @@ class LocationType(BaseModel):
     table: dict[str, int]
 
 
-YamlSource: TypeAlias = strictyaml.YAML
-
 empty_block_location = LocationType(file="", path=[], table={})
 
 
@@ -64,7 +61,6 @@ class LocalizedExpression(BaseModel):
     )
     expr: Any
     location: Optional[LocationType] = None
-    pdl_yaml_src: Optional[YamlSource] = None
 
 
 ExpressionType: TypeAlias = Any | LocalizedExpression
@@ -146,7 +142,6 @@ class Block(BaseModel):
     # Fields for internal use
     result: Optional[Any] = None
     location: Optional[LocationType] = None
-    pdl_yaml_src: Optional[YamlSource] = None
 
 
 class FunctionBlock(Block):

src/pdl/pdl_interpreter.py

@@ -1048,7 +1048,7 @@ def step_call_model(
     ],
 ]:
     # evaluate model name
-    model, concrete_block = process_expr_of(block, "model", scope, loc)
+    _, concrete_block = process_expr_of(block, "model", scope, loc)
     # evaluate model params
     match concrete_block:
         case BamModelBlock():

src/pdl/pdl_parser.py

@@ -1,13 +1,11 @@
 import json
 from pathlib import Path
-from typing import Any
 
-import strictyaml
 import yaml
 from pydantic import ValidationError
 
 from .pdl_analysis import unused_program
-from .pdl_ast import LocationType, PDLException, Program, YamlSource
+from .pdl_ast import LocationType, PDLException, Program
 from .pdl_location_utils import get_line_map
 from .pdl_schema_error_analyzer import analyze_errors
 
@@ -28,7 +26,7 @@ def parse_str(pdl_str: str, file_name: str = "") -> tuple[Program, LocationType]
     loc = LocationType(path=[], file=file_name, table=line_table)
     try:
         prog = Program.model_validate(prog_yaml)
-        set_program_location(prog, pdl_str)
+        # set_program_location(prog, pdl_str)
         unused_program(prog)
     except ValidationError as exc:
         pdl_schema_file = Path(__file__).parent / "pdl-schema.json"
@@ -42,24 +40,24 @@ def parse_str(pdl_str: str, file_name: str = "") -> tuple[Program, LocationType]
     return prog, loc
 
 
-def set_program_location(prog: Program, pdl_str: str, file_name: str = ""):
-    loc = strictyaml.dirty_load(pdl_str, allow_flow_style=True)
-    set_location(prog.root, loc)
-
-
-def set_location(
-    pdl: Any,
-    loc: YamlSource,
-):
-    if hasattr(pdl, "pdl_yaml_src"):
-        pdl.pdl_yaml_src = loc
-    if isinstance(loc.data, dict):
-        for x, v in loc.items():
-            if hasattr(pdl, x.data):
-                set_location(getattr(pdl, x.data), v)
-    elif isinstance(pdl, list) and isinstance(loc.data, list):
-        for data_i, loc_i in zip(pdl, loc):
-            set_location(data_i, loc_i)
+# def set_program_location(prog: Program, pdl_str: str, file_name: str = ""):
+#     loc = strictyaml.dirty_load(pdl_str, allow_flow_style=True)
+#     set_location(prog.root, loc)
+
+
+# def set_location(
+#     pdl: Any,
+#     loc: YamlSource,
+# ):
+#     if hasattr(pdl, "pdl_yaml_src"):
+#         pdl.pdl_yaml_src = loc
+#     if isinstance(loc.data, dict):
+#         for x, v in loc.items():
+#             if hasattr(pdl, x.data):
+#                 set_location(getattr(pdl, x.data), v)
+#     elif isinstance(pdl, list) and isinstance(loc.data, list):
+#         for data_i, loc_i in zip(pdl, loc):
+#             set_location(data_i, loc_i)
 
 
 # def set_program_location(prog: Program, pdl_str: str, file_name: str = ""):

tests/test_ast_utils.py

@@ -0,0 +1,45 @@
+import pathlib
+
+from pdl.pdl_ast_utils import MappedFunctions, iter_block_children, map_block_children
+from pdl.pdl_parser import PDLParseError, parse_file
+
+
+class Counter:
+    def __init__(self):
+        self.cpt = 0
+        
+    def incr(self, *args):
+        self.cpt += 1
+
+class IterCounter:
+    def __init__(self):
+        self.cpt = 0
+
+    def count(self, ast):
+        self.cpt += 1
+        iter_block_children(self.count, ast)
+
+
+class MapCounter:
+    def __init__(self):
+        self.cpt = 0
+
+    def count(map_self, ast):
+        map_self.cpt += 1
+        class C(MappedFunctions):
+            def f_block(c_self, block):
+                return map_self.count(block)
+        _ = map_block_children(C(), ast)
+        return ast
+
+def test_ast_iterators() -> None:
+    for yaml_file_name in pathlib.Path(".").glob("**/*.pdl"):
+        try:
+            ast, _ = parse_file(yaml_file_name)
+            iter_cpt = IterCounter()
+            iter_cpt.count(ast.root)
+            map_cpt = MapCounter()
+            map_cpt.count(ast.root)
+            assert iter_cpt.cpt == map_cpt.cpt, yaml_file_name
+        except PDLParseError:
+            pass