Merge branch 'main' into pdl-aggregators

Author: mandel

examples/demo/8-tools.pdl

@@ -13,7 +13,8 @@ text:
   text: You are Granite, developed by IBM. You are a helpful AI assistant with access to the following tools. When a tool is required to answer the user's query, respond with <|tool_call|> followed by a JSON list of tools used. If a tool does not exist in the provided list of tools, notify the user that you do not have the ability to fulfill the request.
   contribute: [context]
 - role: tools
-  text: ${ tools }
+  content:
+    text: ${ tools }
   contribute: [context]
 - "Out of 1400 participants, 400 passed the test. What percentage is that?\n"
 - def: actions

examples/demo/9-react.pdl

@@ -30,7 +30,8 @@ text:
   text: You are Granite, developed by IBM. You are a helpful AI assistant with access to the following tools. When a tool is required to answer the user's query, respond with <|tool_call|> followed by a JSON list of tools used. If a tool does not exist in the provided list of tools, notify the user that you do not have the ability to fulfill the request.
   contribute: [context]
 - role: tools
-  text: ${ tools }
+  content:
+    text: ${ tools }
   contribute: [context]
 - text:
     |

examples/react/demo.pdl

@@ -30,7 +30,8 @@ text:
   text: You are Granite, developed by IBM. You are a helpful AI assistant with access to the following tools. When a tool is required to answer the user's query, respond with <|tool_call|> followed by a JSON list of tools used. If a tool does not exist in the provided list of tools, notify the user that you do not have the ability to fulfill the request.
   contribute: [context]
 - role: tools
-  text: ${ tools }
+  content:
+    text: ${ tools }
   contribute: [context]
 - text:
     |

examples/tools/calc.pdl

@@ -13,7 +13,8 @@ text:
   text: You are Granite, developed by IBM. You are a helpful AI assistant with access to the following tools. When a tool is required to answer the user's query, respond with <|tool_call|> followed by a JSON list of tools used. If a tool does not exist in the provided list of tools, notify the user that you do not have the ability to fulfill the request.
   contribute: [context]
 - role: tools
-  text: ${ tools }
+  content:
+    text: ${ tools }
   contribute: [context]
 - "Out of 1400 participants, 400 passed the test. What percentage is that?\n"
 - def: actions

src/pdl/pdl_interpreter.py

@@ -258,13 +258,12 @@ def process_block(
                     trace=ErrorBlock(msg=exc.message, pdl__location=loc, program=block),
                 ) from exc
             result = PdlConst(v)
-            stringified_result = lazy_apply(stringify, result)
             background = PdlList(
                 [
                     PdlDict(  # type: ignore
                         {
                             "role": state.role,
-                            "content": stringified_result,
+                            "content": result,
                             "defsite": ".".join(
                                 state.id_stack
                             ),  # Warning: defsite for a literal value
@@ -274,7 +273,7 @@ def process_block(
             )
             trace = DataBlock(
                 data=expr,
-                pdl__result=stringified_result,
+                pdl__result=result,
                 pdl__timing=PdlTiming(start_nanos=start, end_nanos=time.time_ns()),
                 pdl__id=".".join(state.id_stack),
             )
@@ -482,9 +481,8 @@ def process_block_body(
                     loc=exc.loc or loc,
                     trace=ErrorBlock(msg=exc.message, pdl__location=loc, program=block),
                 ) from exc
-            stringified_result = lazy_apply(stringify, result)
             background = PdlList(
-                [PdlDict({"role": state.role, "content": stringified_result})]  # type: ignore
+                [PdlDict({"role": state.role, "content": result})]  # type: ignore
             )
             trace = block.model_copy()
             if state.yield_result:
@@ -499,9 +497,8 @@ def process_block_body(
             else:
                 v, trace = process_expr_of(block, "data", scope, loc)
                 result = PdlConst(v)
-            stringified_result = stringify(v)
             background = PdlList(
-                [PdlDict({"role": state.role, "content": stringified_result})]  # type: ignore
+                [PdlDict({"role": state.role, "content": result})]  # type: ignore
             )
             if state.yield_result:
                 yield_result(result.result(), block.kind)
@@ -1688,9 +1685,8 @@ def process_call_code(
         case "pdl":
             try:
                 result = call_pdl(code_s, scope)
-                stringified_result = lazy_apply(stringify, result)
                 background = PdlList(
-                    [PdlDict({"role": state.role, "content": stringified_result, "defsite": block.pdl__id})]  # type: ignore
+                    [PdlDict({"role": state.role, "content": result, "defsite": block.pdl__id})]  # type: ignore
                 )
             except Exception as exc:
                 raise PDLRuntimeError(