Merge branch 'main' into pdl-299

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

Author: mandel

pdl-live-react/src/pdl_ast.d.ts

@@ -2354,6 +2354,11 @@ export type PdlContext17 =
 export type PdlId17 = string | null
 export type PdlIsLeaf17 = true
 export type Kind17 = "model"
+/**
+ * Model name used by the backend.
+ *
+ */
+export type Model = LocalizedExpression | string
 /**
  * Messages to send to the model.
  *
@@ -2411,11 +2416,6 @@ export type Backend =
   | {
       [k: string]: unknown
     }
-/**
- * IO Processor name.
- *
- */
-export type Processor = LocalizedExpression | string | null
 /**
  * Parameters sent to the model.
  *
@@ -3210,7 +3210,7 @@ export interface GraniteioModelBlock {
   pdl__timing?: PdlTiming | null
   pdl__is_leaf?: PdlIsLeaf17
   kind?: Kind17
-  model: unknown
+  model: Model
   input?: Input
   modelResponse?: Modelresponse
   /**
@@ -3221,7 +3221,7 @@ export interface GraniteioModelBlock {
   pdl__model_input?: PdlModelInput
   platform?: Platform
   backend: Backend
-  processor?: Processor
+  processor?: unknown
   parameters?: Parameters
 }
 /**

pdl-live-react/src/pdl_ast_utils.ts

@@ -1,6 +1,6 @@
 import { match, P } from "ts-pattern"
 
-import { Backend, PdlBlock, Processor } from "./pdl_ast"
+import { Backend, PdlBlock } from "./pdl_ast"
 import { ExpressionT, isArgs } from "./helpers"
 
 export function map_block_children(
@@ -74,10 +74,7 @@ export function map_block_children(
           : undefined
         // @ts-expect-error: f_expr does not preserve the type of the expression
         const backend: Backend = f_expr(block.backend)
-        // @ts-expect-error: f_expr does not preserve the type of the expression
-        const processor: Processor = block.processor
-          ? f_expr(block.processor)
-          : undefined
+        const processor = block.processor ? f_expr(block.processor) : undefined
         return {
           ...block,
           model,

src/pdl/pdl-schema.json

@@ -4461,7 +4461,6 @@
             {
               "$ref": "#/$defs/LocalizedExpression_TypeVar_"
             },
-            {},
             {
               "type": "string"
             }
@@ -4626,6 +4625,7 @@
             {
               "type": "string"
             },
+            {},
             {
               "type": "null"
             }

src/pdl/pdl_ast.py

@@ -548,7 +548,7 @@ class GraniteioModelBlock(ModelBlock):
     platform: Literal[ModelPlatform.GRANITEIO] = ModelPlatform.GRANITEIO
     """Optional field to ensure that the block is using granite-io.
     """
-    model: ExpressionType[object]
+    model: ExpressionType[str]
     """Model name used by the backend.
     """
     backend: ExpressionType[str | dict[str, Any] | object]

src/pdl/pdl_granite_io.py

@@ -26,7 +26,7 @@ def processor_of_block(block: GraniteioModelBlock):
         processor = value_of_expr(block.processor)
         if isinstance(processor, InputOutputProcessor):
             return processor
-        model = value_of_expr(block.model)
+        model: str = value_of_expr(block.model)
         backend = value_of_expr(block.backend)
         assert isinstance(model, str), f"The model should be a string: {model}"
         match backend:

src/pdl/pdl_interpreter.py

@@ -96,6 +96,7 @@
 )
 from .pdl_context import (  # noqa: E402
     DependentContext,
+    IndependentContext,
     PDLContext,
     SerializeMode,
     SingletonContext,
@@ -359,7 +360,11 @@ def set_error_to_scope_for_retry(
         "content": error,
         "defsite": block_id,
     }
-    scope = scope | {"pdl_context": pdl_context * SingletonContext(PdlDict(err_msg))}
+    scope = scope | {
+        "pdl_context": DependentContext(
+            [pdl_context, SingletonContext(PdlDict(err_msg))]
+        )
+    }
     return scope
 
 
@@ -605,9 +610,13 @@ def process_block_body(
                             append(obj_loc, k),
                         )
                         if block.context == IndependentEnum.DEPENDENT:
-                            background = background * value_background
+                            background = DependentContext(
+                                [background, value_background]
+                            )
                         else:
-                            background = background + value_background
+                            background = IndependentContext(
+                                [background, value_background]
+                            )
                         if (
                             block.context is IndependentEnum.INDEPENDENT
                         ):  # reset pdl_context
@@ -829,7 +838,9 @@ def process_block_body(
                                     }
                                 ]
                             )
-                    scope = scope | {"pdl_context": pdl_context_init * background}
+                    scope = scope | {
+                        "pdl_context": DependentContext([pdl_context_init, background])
+                    }
                     if items is not None:
                         for k in items.keys():
                             scope = scope | {k: items[k][iidx]}
@@ -845,9 +856,13 @@ def process_block_body(
                         repeat_loc,
                     )
                     if block.context is IndependentEnum.DEPENDENT:
-                        saved_background = saved_background * iteration_background
+                        saved_background = DependentContext(
+                            [saved_background, iteration_background]
+                        )
                     else:
-                        saved_background = saved_background + iteration_background
+                        saved_background = IndependentContext(
+                            [saved_background, iteration_background]
+                        )
 
                     if block.context is IndependentEnum.DEPENDENT:
                         background = saved_background
@@ -1088,7 +1103,9 @@ def process_blocks(  # pylint: disable=too-many-arguments,too-many-positional-ar
         try:
             for i, block in enumerate(blocks):
                 iteration_state = iteration_state.with_iter(i)
-                scope = scope | {"pdl_context": pdl_context_init * background}
+                scope = scope | {
+                    "pdl_context": DependentContext([pdl_context_init, background])
+                }
                 new_loc = append(loc, "[" + str(i) + "]")
                 if iteration_type == IterationType.LASTOF and state.yield_result:
                     iteration_state = state.with_yield_result(i + 1 == len(blocks))
@@ -1100,9 +1117,13 @@ def process_blocks(  # pylint: disable=too-many-arguments,too-many-positional-ar
                 ) = process_block(iteration_state, scope, block, new_loc)
                 results.append(iteration_result)
                 if context == IndependentEnum.DEPENDENT:
-                    saved_background = saved_background * iteration_background
+                    saved_background = DependentContext(
+                        [saved_background, iteration_background]
+                    )
                 else:
-                    saved_background = saved_background + iteration_background
+                    saved_background = IndependentContext(
+                        [saved_background, iteration_background]
+                    )
 
                 if context == IndependentEnum.DEPENDENT:
                     background = saved_background