Merge branch 'main' into ppdl-01

Author: mandel

docs/tutorial.md

@@ -378,7 +378,7 @@ Bob lives at the following address:
 ## Parsing the output of a block
 
 As we saw in the previous section, it is possible to use the `parser: json` setting to parse the result of a block as a JSON.
-Other possible values for `parser` are `yaml`, `jsonl`, or `regex`.
+Other possible values for `parser` are `yaml`, `jsonl`, `regex`, or `csv`.
 
 The following example extracts using a regular expression parser the code between triple backtick generated by a model:
 

pdl-live-react/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "PDL",
   "private": true,
-  "version": "0.9.0",
+  "version": "0.9.1",
   "type": "module",
   "scripts": {
     "prod:mac:1": "npm run tauri build -- --no-bundle --target=universal-apple-darwin",

pdl-live-react/package.json

@@ -1,6 +1,6 @@
 [package]
 name = "pdl"
-version = "0.9.0"
+version = "0.9.1"
 description = "Prompt Declaration Language"
 authors = ["[email protected]"]
 edition = "2024"

pdl-live-react/src-tauri/Cargo.lock

@@ -4157,7 +4157,8 @@
           "enum": [
             "json",
             "jsonl",
-            "yaml"
+            "yaml",
+            "csv"
           ],
           "type": "string"
         },

pdl-live-react/src-tauri/Cargo.toml

@@ -304,7 +304,7 @@ class RegexParser(Parser):
 
 
 ParserType = TypeAliasType(
-    "ParserType", Union[Literal["json", "jsonl", "yaml"], PdlParser, RegexParser]
+    "ParserType", Union[Literal["json", "jsonl", "yaml", "csv"], PdlParser, RegexParser]
 )
 """Different parsers."""
 OptionalParserType = TypeAliasType("OptionalParserType", Optional[ParserType])

src/pdl/pdl-schema.json

@@ -1,4 +1,5 @@
 # pylint: disable=import-outside-toplevel
+import csv
 import json
 import re
 import shlex
@@ -13,6 +14,7 @@
 from abc import ABC, abstractmethod
 from concurrent.futures import ThreadPoolExecutor
 from functools import partial, reduce
+from io import StringIO
 from itertools import count
 from os import getenv
 from pathlib import Path
@@ -2673,6 +2675,18 @@ def parse_result(parser: ParserType, text: str) -> JSONReturnType:
                 raise PDLRuntimeParserError(
                     f"Attempted to parse ill-formed YAML: {repr(exc)}"
                 ) from exc
+        case "csv":
+            try:
+                result = []
+                reader = csv.reader(StringIO(text))
+                for row in reader:
+                    result.append(row)
+            except KeyboardInterrupt as exc:
+                raise exc from exc
+            except Exception as exc:
+                raise PDLRuntimeParserError(
+                    f"Attempted to parse ill-formed CSV: {repr(exc)}"
+                ) from exc
         case PdlParser():
             assert False, "TODO"
         case RegexParser(mode="search" | "match" | "fullmatch"):

src/pdl/pdl_ast.py

@@ -172,3 +172,19 @@ def test_parser_case2():
     """
     result = exec_str(prog)
     assert result == ["1", "2", "3", "4"]
+
+
+def test_parser_csv():
+    csv_parser = """
+    text: |
+        1,Apple,Red
+        2,Orange,Orange
+        3,Banana,Yellow
+    parser: csv
+    """
+    result = exec_str(csv_parser)
+    assert result == [
+        ["1", "Apple", "Red"],
+        ["2", "Orange", "Orange"],
+        ["3", "Banana", "Yellow"],
+    ]