Fixes

Author: mandel

pdl-live/src/pdl_ast.d.ts

@@ -3076,7 +3076,7 @@ export interface CallBlock {
   result?: unknown;
   location?: LocationType | null;
   kind?: Kind18;
-  call: Call;
+  call: unknown;
   args?: Args;
   trace?: Trace6;
 }
@@ -3473,7 +3473,7 @@ export interface DataBlock {
   result?: unknown;
   location?: LocationType | null;
   kind?: Kind13;
-  data: Data;
+  data: unknown;
   raw?: Raw;
 }
 /**
@@ -3551,7 +3551,7 @@ export interface IfBlock {
   result?: unknown;
   location?: LocationType | null;
   kind?: Kind12;
-  if: If;
+  if: unknown;
   then: Then;
   else?: Else;
   if_result?: IfResult;
@@ -3712,7 +3712,7 @@ export interface RepeatUntilBlock {
   location?: LocationType | null;
   kind?: Kind10;
   repeat: Repeat1;
-  until: Until;
+  until: unknown;
   join?: Join1;
   trace?: Trace2;
 }
@@ -4585,26 +4585,6 @@ export interface JoinArray {
 export interface JoinLastOf {
   as: As2;
 }
-/**
- * Condition of the loop.
- *
- */
-export interface Until {
-  [k: string]: unknown;
-}
-/**
- * Condition.
- *
- */
-export interface If {
-  [k: string]: unknown;
-}
-/**
- * Value defined.
- */
-export interface Data {
-  [k: string]: unknown;
-}
 export interface BamTextGenerationParameters {
   beam_width?: BeamWidth;
   decoding_method?: DecodingMethod | null;
@@ -4717,13 +4697,6 @@ export interface LitellmParameters {
   max_retries?: MaxRetries;
   [k: string]: unknown;
 }
-/**
- * Function to call.
- *
- */
-export interface Call {
-  [k: string]: unknown;
-}
 /**
  * Arguments of the function with their values.
  *

src/pdl/pdl-schema.json

@@ -1009,7 +1009,10 @@
             {
               "type": "string"
             },
-            {}
+            {},
+            {
+              "$ref": "#/$defs/LocalizedExpression"
+            }
           ],
           "title": "Model"
         },
@@ -1964,6 +1967,12 @@
           "type": "string"
         },
         "call": {
+          "anyOf": [
+            {},
+            {
+              "$ref": "#/$defs/LocalizedExpression"
+            }
+          ],
           "description": "Function to call.\n    ",
           "title": "Call"
         },
@@ -4627,6 +4636,14 @@
           "type": "string"
         },
         "for": {
+          "additionalProperties": {
+            "anyOf": [
+              {},
+              {
+                "$ref": "#/$defs/LocalizedExpression"
+              }
+            ]
+          },
           "description": "Arrays to iterate over.\n    ",
           "title": "For",
           "type": "object"
@@ -8467,7 +8484,10 @@
             {
               "type": "string"
             },
-            {}
+            {},
+            {
+              "$ref": "#/$defs/LocalizedExpression"
+            }
           ],
           "title": "Model"
         },
@@ -9134,7 +9154,7 @@
     },
     "LocalizedExpression": {
       "additionalProperties": false,
-      "description": "Expression with location information\n    ",
+      "description": "Expression with location information",
       "properties": {
         "expr": {
           "title": "Expr"
@@ -11714,6 +11734,9 @@
         "read": {
           "anyOf": [
             {},
+            {
+              "$ref": "#/$defs/LocalizedExpression"
+            },
             {
               "type": "null"
             }

src/pdl/pdl_ast_utils.py

@@ -32,10 +32,6 @@
 )
 
 
-def is_block_list(blocks: BlocksType) -> bool:
-    return not isinstance(blocks, str) and isinstance(blocks, Sequence)
-
-
 def iter_block_children(f: Callable[[BlockType], None], block: BlockType) -> None:
     if not isinstance(block, Block):
         return
@@ -114,7 +110,8 @@ def iter_block_children(f: Callable[[BlockType], None], block: BlockType) -> Non
 
 
 def iter_blocks(f: Callable[[BlockType], None], blocks: BlocksType) -> None:
-    if is_block_list(blocks):
+    if not isinstance(blocks, str) and isinstance(blocks, Sequence):
+        # Is a list of blocks
         for block in blocks:
             f(block)
     else:
@@ -219,7 +216,7 @@ def map_block_children(f: MappedFunctions, block: BlockType) -> BlockType:
 
 def map_blocks(f: MappedFunctions, blocks: BlocksType) -> BlocksType:
     if not isinstance(blocks, str) and isinstance(blocks, Sequence):
-        # is a list of blocks
+        # Is a list of blocks
         blocks = [f.f_block(block) for block in blocks]
     else:
         blocks = f.f_block(blocks)

src/pdl/pdl_dumper.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, TypeAlias
+from typing import Any, Sequence, TypeAlias
 
 import yaml
 
@@ -35,7 +35,6 @@
     RepeatUntilBlock,
     TextBlock,
 )
-from .pdl_ast_utils import is_block_list
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore
 
@@ -236,7 +235,8 @@ def blocks_to_dict(
     result: (
         int | float | str | dict[str, Any] | list[int | float | str | dict[str, Any]]
     )
-    if is_block_list(blocks):
+    if not isinstance(blocks, str) and isinstance(blocks, Sequence):
+        # Is a list of blocks
         result = [block_to_dict(block, json_compatible) for block in blocks]
     else:
         result = block_to_dict(blocks, json_compatible)

src/pdl/pdl_interpreter.py

@@ -8,7 +8,7 @@
 
 # from itertools import batched
 from pathlib import Path
-from typing import Any, Generator, Optional, TypeVar
+from typing import Any, Generator, Optional, Sequence, TypeVar
 
 import litellm
 import yaml
@@ -65,7 +65,6 @@
     TextBlock,
     empty_block_location,
 )
-from .pdl_ast_utils import is_block_list
 from .pdl_dumper import blocks_to_dict
 from .pdl_llms import BamModel, LitellmModel
 from .pdl_location_utils import append, get_loc_string
@@ -806,7 +805,8 @@ def step_blocks(
     background: Messages
     trace: BlocksType
     results = []
-    if is_block_list(blocks):
+    if not isinstance(blocks, str) and isinstance(blocks, Sequence):
+        # Is a list of blocks
         iteration_state = state.with_yield_result(
             state.yield_result and iteration_type != IterationType.ARRAY
         )

src/pdl/pdl_parser.py

@@ -1,26 +1,13 @@
 import json
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import strictyaml
 import yaml
 from pydantic import ValidationError
 
-from .pdl_ast import (
-    Block,
-    BlocksType,
-    CallBlock,
-    DataBlock,
-    FunctionBlock,
-    LastOfBlock,
-    LocationType,
-    ModelBlock,
-    PDLException,
-    Program,
-    YamlSource,
-)
-from .pdl_ast_utils import is_block_list
-from .pdl_location_utils import append, get_line_map
+from .pdl_ast import LocationType, PDLException, Program, YamlSource
+from .pdl_location_utils import get_line_map
 from .pdl_schema_error_analyzer import analyze_errors