feat: allow unnamed arguments when calling a PDL function in Jinja (#1076)

Signed-off-by: Louis Mandel <[email protected]>

Author: mandel

src/pdl/pdl_interpreter.py

@@ -193,11 +193,24 @@ class ClosureBlock(FunctionBlock):
     pdl__scope: SkipJsonSchema[Optional[ScopeType]] = Field(repr=False)
     pdl__state: SkipJsonSchema[InterpreterState] = Field(repr=False)
 
-    def __call__(self, **kwds):
+    def __call__(self, *args, **kwargs):
         state = self.pdl__state.with_yield_result(False).with_yield_background(False)
         current_context = state.current_pdl_context.ref
+        if len(args) > 0:
+            keys = self.function.keys() if self.function is not None else {}
+            if len(keys) < len(args):
+                if self.signature is not None and self.signature.get("name", "") != "":
+                    err = f"Too many arguments to the call of {self.signature['name']}"
+                else:
+                    err = "Too many arguments to the call"
+                raise PDLRuntimeExpressionError(
+                    err,
+                    loc=self.pdl__location,
+                    trace=self.model_copy(),
+                )
+            kwargs = dict(zip(keys, args)) | kwargs
         result, _, _ = execute_call(
-            state, current_context, self, kwds, empty_block_location
+            state, current_context, self, kwargs, self.pdl__location
         )
         return result
 

tests/test_function.py

@@ -136,19 +136,19 @@ def test_call_from_code_01():
       x:
       y:
     return:
-      ${x + 1}
+      ${x + y}
 array:
 - call: ${f}
   args:
     x: 1
-    y: 1
+    y: 2
 - ${ f(x=1, y=2) }
 - lang: python
   code:
     result = f(x=1, y=2)
 """
     result = exec_str(prog)
-    assert result == [2, 2, 2]
+    assert result == [3, 3, 3]
 
 
 def test_call_from_code_02():
@@ -234,3 +234,26 @@ def test_call_from_code_04():
         "Bye[{'role': 'user', 'content': 'Hello', 'pdl__defsite': 'lastOf.0'},{'role': 'user', 'content': 'Bye', 'pdl__defsite': 'lastOf.1.array.1.text.0'}]",
         "Bye[{'role': 'user', 'content': 'Hello', 'pdl__defsite': 'lastOf.0'},{'role': 'user', 'content': 'Bye', 'pdl__defsite': 'lastOf.1.array.2.text.0.code'}]",
     ]
+
+
+def test_call_from_code_05():
+    prog = """
+defs:
+  f:
+    function:
+      x:
+      y:
+    return:
+      ${x - y}
+array:
+- call: ${f}
+  args:
+    x: 2
+    y: 1
+- ${ f(2, 1) }
+- lang: python
+  code:
+    result = f(2, 1)
+"""
+    result = exec_str(prog)
+    assert result == [1, 1, 1]

tests/test_type_checking.py

@@ -605,23 +605,3 @@ def test_deprecated(capsys: pytest.CaptureFixture[str]):
     do_test_stderr(
         capsys, prog, ["Deprecated type syntax: use integer instead of int.", ""]
     )
-
-
-def test_function_call_jinja_19():
-    prog = """
-defs:
-  f:
-    function:
-      x:
-      y:
-    return:
-      ${x + 1}
-array:
-- call: ${f}
-  args:
-    x: 1
-    y: 1
-- ${ f(1, 2) }
-"""
-    with pytest.raises(PDLRuntimeError):
-        exec_str(prog)