support for expressions in function call args (#221)

Signed-off-by: Mandana Vaziri <[email protected]>

Author: vazirim

examples/callback/repair_prompt.pdl

@@ -11,7 +11,7 @@ lastOf:
 - def: raw_output
   model: replicate/ibm-granite/granite-3.0-8b-instruct
   parameters:
-    stop_sequences: "\n\n"
+    #stop_sequences: "\n\n"
     temperature: 0
 
 - lang: python

examples/demo/3-weather.pdl

@@ -19,8 +19,8 @@ text:
 - lang: python
   code: |
     import requests
-    #response = requests.get('https://api.weatherapi.com/v1/current.json?key==XYZ=${ LOCATION }') 
-    #Mock response:
+    #result = requests.get('https://api.weatherapi.com/v1/current.json?key==XYZ=${ LOCATION }') 
+    #Mock result:
     result = '{"location": {"name": "Madrid", "region": "Madrid", "country": "Spain", "lat": 40.4, "lon": -3.6833, "tz_id": "Europe/Madrid", "localtime_epoch": 1732543839, "localtime": "2024-11-25 15:10"}, "current": {"last_updated_epoch": 1732543200, "last_updated": "2024-11-25 15:00", "temp_c": 14.4, "temp_f": 57.9, "is_day": 1, "condition": {"text": "Partly cloudy", "icon": "//cdn.weatherapi.com/weather/64x64/day/116.png", "code": 1003}, "wind_mph": 13.2, "wind_kph": 21.2, "wind_degree": 265, "wind_dir": "W", "pressure_mb": 1017.0, "pressure_in": 30.03, "precip_mm": 0.01, "precip_in": 0.0, "humidity": 77, "cloud": 75, "feelslike_c": 12.8, "feelslike_f": 55.1, "windchill_c": 13.0, "windchill_f": 55.4, "heatindex_c": 14.5, "heatindex_f": 58.2, "dewpoint_c": 7.3, "dewpoint_f": 45.2, "vis_km": 10.0, "vis_miles": 6.0, "uv": 1.4, "gust_mph": 15.2, "gust_kph": 24.4}}'
   def: WEATHER
   parser: json

examples/weather/weather.pdl

@@ -19,8 +19,8 @@ text:
 - lang: python
   code: |
     import requests
-    #response = requests.get('https://api.weatherapi.com/v1/current.json?key==XYZ=${ LOCATION }') 
-    #Mock response:
+    #result = requests.get('https://api.weatherapi.com/v1/current.json?key==XYZ=${ LOCATION }') 
+    #Mock result:
     result = '{"location": {"name": "Madrid", "region": "Madrid", "country": "Spain", "lat": 40.4, "lon": -3.6833, "tz_id": "Europe/Madrid", "localtime_epoch": 1732543839, "localtime": "2024-11-25 15:10"}, "current": {"last_updated_epoch": 1732543200, "last_updated": "2024-11-25 15:00", "temp_c": 14.4, "temp_f": 57.9, "is_day": 1, "condition": {"text": "Partly cloudy", "icon": "//cdn.weatherapi.com/weather/64x64/day/116.png", "code": 1003}, "wind_mph": 13.2, "wind_kph": 21.2, "wind_degree": 265, "wind_dir": "W", "pressure_mb": 1017.0, "pressure_in": 30.03, "precip_mm": 0.01, "precip_in": 0.0, "humidity": 77, "cloud": 75, "feelslike_c": 12.8, "feelslike_f": 55.1, "windchill_c": 13.0, "windchill_f": 55.4, "heatindex_c": 14.5, "heatindex_f": 58.2, "dewpoint_c": 7.3, "dewpoint_f": 45.2, "vis_km": 10.0, "vis_miles": 6.0, "uv": 1.4, "gust_mph": 15.2, "gust_kph": 24.4}}'
   def: WEATHER
   parser: json

src/pdl/pdl-schema.json

@@ -1442,10 +1442,18 @@
           "title": "Call"
         },
         "args": {
+          "anyOf": [
+            {},
+            {
+              "$ref": "#/$defs/LocalizedExpression"
+            },
+            {
+              "type": "object"
+            }
+          ],
           "default": {},
           "description": "Arguments of the function with their values.\n    ",
-          "title": "Args",
-          "type": "object"
+          "title": "Args"
         },
         "trace": {
           "anyOf": [

src/pdl/pdl_ast.py

@@ -165,7 +165,7 @@ class CallBlock(Block):
     call: ExpressionType
     """Function to call.
     """
-    args: dict[str, Any] = {}
+    args: ExpressionType | dict[str, Any] = {}
     """Arguments of the function with their values.
     """
     # Field for internal use

src/pdl/pdl_ast_utils.py

@@ -134,7 +134,10 @@ def map_block_children(f: MappedFunctions, block: BlockType) -> BlockType:
             block.returns = f.f_block(block.returns)
         case CallBlock():
             block.call = f.f_expr(block.call)
-            block.args = {x: f.f_expr(e) for x, e in block.args.items()}
+            if isinstance(block.args, dict):
+                block.args = {x: f.f_expr(e) for x, e in block.args.items()}
+            else:
+                block.args = f.f_expr(block.args)
             if block.trace is not None:
                 block.trace = f.f_block(block.trace)
         case BamModelBlock() | LitellmModelBlock():

tests/data/call_expression_args.pdl

@@ -0,0 +1,23 @@
+defs:
+  get_current_stock:
+    function:
+      product_name: str
+    return:
+      "FN::get_current_stock:: '${product_name}'\n"
+text:
+
+  - def: object_example
+    text: '{"product_name": "from_object"}'
+    parser: json
+    contribute: []
+
+  - def: simple_call
+    call: get_current_stock
+    args:
+      product_name: "Simple call!"
+
+  - "${object_example}\n"
+
+  - def: with_object_args
+    call: get_current_stock
+    args: ${object_example}

tests/results/tests/data/call_expression_args.12.result

@@ -0,0 +1,4 @@
+FN::get_current_stock:: 'Simple call!'
+{'product_name': 'from_object'}
+FN::get_current_stock:: 'from_object'
+

tests/test_examples_run.py

@@ -93,14 +93,6 @@ class InputsType:
         / "hello"
         / "hello-data.pdl": InputsType(scope={"something": "ABC"}),
         pathlib.Path("examples")
-        / "weather"
-        / "weather.pdl": InputsType(stdin="What is the weather in Yorktown Heights?\n"),
-        pathlib.Path("examples")
-        / "demo"
-        / "3-weather.pdl": InputsType(
-            stdin="What is the weather in Yorktown Heights?\n"
-        ),
-        pathlib.Path("examples")
         / "tutorial"
         / "conditionals_loops.pdl": InputsType(
             stdin="What is APR?\nno\nSay it as a poem\nyes\n"

tests/test_function.py

@@ -1,3 +1,4 @@
+from pdl.pdl import exec_file
 from pdl.pdl_ast import Program  # pylint: disable=no-name-in-module
 from pdl.pdl_interpreter import (  # pylint: disable=no-name-in-module
     InterpreterState,
@@ -107,3 +108,11 @@ def test_call_template():
     data = Program.model_validate(hello_call_template)
     text, _, _, _ = process_prog(state, empty_scope, data)
     assert text == "Hello World!"
+
+
+def test_call_expression_args():
+    result = exec_file("tests/data/call_expression_args.pdl")
+    assert (
+        result
+        == "FN::get_current_stock:: 'Simple call!'\n{'product_name': 'from_object'}\nFN::get_current_stock:: 'from_object'\n"
+    )