diff --git a/examples/talk/6-code-json.pdl b/examples/talk/6-code-json.pdl
index b24945831..a37180531 100644
--- a/examples/talk/6-code-json.pdl
+++ b/examples/talk/6-code-json.pdl
@@ -26,6 +26,8 @@ text:
 - def: EVAL
   contribute: []
   lang: python
+  requirements:
+  - textdistance
   code:
     |
     import textdistance
diff --git a/pdl-live-react/src-tauri/src/cli/run.rs b/pdl-live-react/src-tauri/src/cli/run.rs
index 92eb6d32f..9b47f043f 100644
--- a/pdl-live-react/src-tauri/src/cli/run.rs
+++ b/pdl-live-react/src-tauri/src/cli/run.rs
@@ -2,10 +2,17 @@ use ::std::path::Path;
 use duct::cmd;
 use futures::executor::block_on;
 use yaml_rust2::yaml::LoadError;
+use yaml_rust2::{ScanError, Yaml, YamlLoader};
 
-use crate::interpreter::pip::pip_install_internal_if_needed;
+use crate::interpreter::pip::{pip_install_code_blocks_if_needed, pip_install_internal_if_needed};
 use crate::interpreter::pull::pull_if_needed;
 
+/// Read the given filesystem path and produce a potentially multi-document Yaml
+fn from_path(path: &String) -> Result<Vec<Yaml>, ScanError> {
+    let content = std::fs::read_to_string(path).unwrap();
+    YamlLoader::load_from_str(&content)
+}
+
 #[cfg(desktop)]
 pub fn run_pdl_program(
     source_file_path: String,
@@ -20,9 +27,11 @@ pub fn run_pdl_program(
     );
 
     // async the model pull and pip installs
-    let pull_future = pull_if_needed(&source_file_path);
+    let program = &from_path(&source_file_path).unwrap()[0];
+    let pull_future = pull_if_needed(&program);
+    let reqs_future = pip_install_code_blocks_if_needed(&app_handle, &program);
     let bin_path_future =
-        pip_install_internal_if_needed(app_handle, &"interpreter/requirements.txt");
+        pip_install_internal_if_needed(&app_handle, &"interpreter/requirements.txt");
 
     // wait for any model pulls to finish
     block_on(pull_future).map_err(|e| match e {
@@ -33,6 +42,7 @@ pub fn run_pdl_program(
 
     // wait for any pip installs to finish
     let bin_path = block_on(bin_path_future)?;
+    block_on(reqs_future)?;
 
     let mut args = vec![
         source_file_path,
diff --git a/pdl-live-react/src-tauri/src/compile/beeai.rs b/pdl-live-react/src-tauri/src/compile/beeai.rs
index bdf686eab..d6db5af71 100644
--- a/pdl-live-react/src-tauri/src/compile/beeai.rs
+++ b/pdl-live-react/src-tauri/src/compile/beeai.rs
@@ -291,7 +291,7 @@ fn python_source_to_json(
         eprintln!("Compiling from Python source");
     }
     let bin_path = block_on(pip_install_internal_if_needed(
-        app_handle,
+        &app_handle,
         &"interpreter/beeai-requirements.txt",
     ))?;
 
diff --git a/pdl-live-react/src-tauri/src/interpreter/extract.rs b/pdl-live-react/src-tauri/src/interpreter/extract.rs
index 640915e8e..1b7d2abbf 100644
--- a/pdl-live-react/src-tauri/src/interpreter/extract.rs
+++ b/pdl-live-react/src-tauri/src/interpreter/extract.rs
@@ -1,16 +1,18 @@
 use yaml_rust2::Yaml;
 
-/// Extract models referenced by the programs
-pub fn extract_models(programs: Vec<Yaml>) -> Vec<String> {
-    extract_values(programs, "model")
+/// Extract models referenced by the program
+pub fn extract_models(program: &Yaml) -> Vec<String> {
+    extract_values(program, "model")
+}
+
+/// Extract requirements.txt referenced by the program
+pub fn extract_requirements(program: &Yaml) -> Vec<String> {
+    extract_values(program, "requirements")
 }
 
 /// Take a list of Yaml fragments and produce a vector of the string-valued entries of the given field
-pub fn extract_values(programs: Vec<Yaml>, field: &str) -> Vec<String> {
-    let mut values = programs
-        .into_iter()
-        .flat_map(|p| extract_one_values(p, field))
-        .collect::<Vec<String>>();
+pub fn extract_values(program: &Yaml, field: &str) -> Vec<String> {
+    let mut values = extract_one_values(program, field);
 
     // A single program may specify the same model more than once. Dedup!
     values.sort();
@@ -20,7 +22,7 @@ pub fn extract_values(programs: Vec<Yaml>, field: &str) -> Vec<String> {
 }
 
 /// Take one Yaml fragment and produce a vector of the string-valued entries of the given field
-fn extract_one_values(program: Yaml, field: &str) -> Vec<String> {
+fn extract_one_values(program: &Yaml, field: &str) -> Vec<String> {
     let mut values: Vec<String> = Vec::new();
 
     match program {
@@ -31,6 +33,10 @@ fn extract_one_values(program: Yaml, field: &str) -> Vec<String> {
                         Yaml::String(m) => {
                             values.push(m.to_string());
                         }
+                        Yaml::Array(a) => a.into_iter().for_each(|v| match v {
+                            Yaml::String(m) => values.push(m.to_string()),
+                            _ => {}
+                        }),
                         _ => {}
                     },
                     _ => {}
diff --git a/pdl-live-react/src-tauri/src/interpreter/pip.rs b/pdl-live-react/src-tauri/src/interpreter/pip.rs
index 88c96518d..b85e8fd32 100644
--- a/pdl-live-react/src-tauri/src/interpreter/pip.rs
+++ b/pdl-live-react/src-tauri/src/interpreter/pip.rs
@@ -1,23 +1,32 @@
-use ::std::fs::{copy, create_dir_all};
+use ::std::fs::{copy, create_dir_all, write};
 use ::std::path::{Path, PathBuf};
 
 use duct::cmd;
+use rayon::prelude::*;
 use tauri::path::BaseDirectory;
 use tauri::Manager;
+use tempfile::Builder;
+use yaml_rust2::Yaml;
 
+use crate::interpreter::extract;
 use crate::interpreter::shasum;
 
 #[cfg(desktop)]
-pub async fn pip_install_if_needed(
+fn pip_install_if_needed_with_hash(
     cache_path: &Path,
     requirements_path: &Path,
+    hash: String,
+    force: bool,
 ) -> Result<PathBuf, tauri::Error> {
     create_dir_all(&cache_path)?;
 
-    let hash = shasum::sha256sum(&requirements_path)?;
     let venv_path = cache_path.join("venvs").join(hash);
     let bin_path = venv_path.join(if cfg!(windows) { "Scripts" } else { "bin" });
 
+    // re: force, this is part of the short-term hack to install all
+    // code block dependencies in the main interpreter venv. Once we
+    // figure out how to support a separate venv for each code block
+    // (that needs it), we can undo this hack.
     if !venv_path.exists() {
         println!("Creating virtual environment...");
         let python = if cfg!(target_os = "macos") {
@@ -27,18 +36,65 @@ pub async fn pip_install_if_needed(
         };
         cmd!(python, "-mvenv", &venv_path).run()?;
 
-        cmd!(bin_path.join("pip"), "install", "-r", &requirements_path,).run()?;
+        if !force {
+            cmd!(bin_path.join("pip"), "install", "-r", &requirements_path).run()?;
+
+            let cached_requirements_path = venv_path.join("requirements.txt");
+            copy(requirements_path, cached_requirements_path)?;
+        }
+    }
 
-        let cached_requirements_path = venv_path.join("requirements.txt");
-        copy(requirements_path, cached_requirements_path)?;
+    if force {
+        cmd!(bin_path.join("pip"), "install", "-r", &requirements_path).run()?;
     }
 
     Ok(bin_path.to_path_buf())
 }
 
+#[cfg(desktop)]
+fn pip_install_if_needed(
+    cache_path: &Path,
+    requirements_path: &Path,
+) -> Result<PathBuf, tauri::Error> {
+    let hash = shasum::sha256sum(&requirements_path)?;
+    pip_install_if_needed_with_hash(cache_path, requirements_path, hash, false)
+}
+
+#[cfg(desktop)]
+pub async fn pip_install_code_blocks_if_needed(
+    app_handle: &tauri::AppHandle,
+    program: &Yaml,
+) -> Result<(), tauri::Error> {
+    let cache_path = app_handle.path().cache_dir()?.join("pdl");
+
+    // for now, install the requirements in the main interpreter venv
+    let requirements_path = app_handle
+        .path()
+        .resolve("interpreter/requirements.txt", BaseDirectory::Resource)?;
+
+    extract::extract_requirements(program)
+        .into_par_iter()
+        .try_for_each(|req| -> Result<(), tauri::Error> {
+            let req_path = Builder::new()
+                .prefix("pdl-requirements-")
+                .suffix(".txt")
+                .tempfile()?;
+            // This is part of the "force" hack described above, where
+            // we force the code block dependencies to be installed in
+            // the main interpreter venv.
+            let hash = shasum::sha256sum(&requirements_path)?;
+            write(&req_path, req)?;
+            pip_install_if_needed_with_hash(&cache_path, &req_path.path(), hash, true)?;
+            Ok(())
+        })
+        .expect("code block requirements installed");
+
+    Ok(())
+}
+
 #[cfg(desktop)]
 pub async fn pip_install_internal_if_needed(
-    app_handle: tauri::AppHandle,
+    app_handle: &tauri::AppHandle,
     requirements: &str,
 ) -> Result<PathBuf, tauri::Error> {
     // the interpreter requirements.txt
@@ -48,5 +104,5 @@ pub async fn pip_install_internal_if_needed(
 
     let cache_path = app_handle.path().cache_dir()?.join("pdl");
 
-    pip_install_if_needed(&cache_path, &requirements_path).await
+    pip_install_if_needed(&cache_path, &requirements_path)
 }
diff --git a/pdl-live-react/src-tauri/src/interpreter/pull.rs b/pdl-live-react/src-tauri/src/interpreter/pull.rs
index accdbe2ae..2519f7210 100644
--- a/pdl-live-react/src-tauri/src/interpreter/pull.rs
+++ b/pdl-live-react/src-tauri/src/interpreter/pull.rs
@@ -1,19 +1,13 @@
 use duct::cmd;
 use rayon::prelude::*;
 use yaml_rust2::yaml::LoadError;
-use yaml_rust2::{ScanError, Yaml, YamlLoader};
+use yaml_rust2::Yaml;
 
 use crate::interpreter::extract;
 
-/// Read the given filesystem path and produce a potentially multi-document Yaml
-fn from_path(path: &String) -> Result<Vec<Yaml>, ScanError> {
-    let content = std::fs::read_to_string(path).unwrap();
-    YamlLoader::load_from_str(&content)
-}
-
 /// Pull models (in parallel) from the PDL program in the given filepath.
-pub async fn pull_if_needed(path: &String) -> Result<(), LoadError> {
-    extract::extract_models(from_path(path).unwrap())
+pub async fn pull_if_needed(program: &Yaml) -> Result<(), LoadError> {
+    extract::extract_models(program)
         .into_par_iter()
         .try_for_each(|model| match model {
             m if model.starts_with("ollama/") => ollama_pull_if_needed(&m[7..]),
diff --git a/pdl-live-react/src/helpers.ts b/pdl-live-react/src/helpers.ts
index 110b23ffa..6eb165bc2 100644
--- a/pdl-live-react/src/helpers.ts
+++ b/pdl-live-react/src/helpers.ts
@@ -5,9 +5,10 @@ import type {
   PdlBlock,
   TextBlock,
   ArgsBlock,
-  CodeBlock,
   PdlModelInput,
   LocalizedExpression,
+  PythonCodeBlock,
+  NonPythonCodeBlock,
 } from "./pdl_ast"
 
 /** Re-export for convenience */
@@ -301,11 +302,15 @@ export function extractStructuredModelResponse({
   return { resultForDisplay, lang, meta }
 }
 
-export function isArgs(block: ArgsBlock | CodeBlock): block is ArgsBlock {
+export function isArgs(
+  block: ArgsBlock | PythonCodeBlock | NonPythonCodeBlock,
+): block is ArgsBlock {
   return Array.isArray((block as ArgsBlock).args)
 }
 
-export function extractCode({ code }: CodeBlock): string {
+export function extractCode({
+  code,
+}: PythonCodeBlock | NonPythonCodeBlock): string {
   if (
     isNonScalarPdlBlock(code) &&
     hasResult(code) &&
diff --git a/pdl-live-react/src/pdl_ast.d.ts b/pdl-live-react/src/pdl_ast.d.ts
index 81d21bdca..7fb52de26 100644
--- a/pdl-live-react/src/pdl_ast.d.ts
+++ b/pdl-live-react/src/pdl_ast.d.ts
@@ -17,7 +17,8 @@ export type Program =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -140,6 +141,11 @@ export type Description19 = string | null
  *
  */
 export type Description20 = string | null
+/**
+ * Documentation associated to the block.
+ *
+ */
+export type Description21 = string | null
 /**
  * Name of the variable used to store the result of the execution of the block.
  *
@@ -167,8 +173,8 @@ export type Parser =
   | PdlParser
   | RegexParser
   | null
-export type Description21 = string | null
-export type Spec21 = {
+export type Description22 = string | null
+export type Spec22 = {
   [k: string]: unknown
 } | null
 export type Pdl =
@@ -179,7 +185,8 @@ export type Pdl =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -197,8 +204,8 @@ export type Pdl =
   | ErrorBlock
   | EmptyBlock
   | null
-export type Description22 = string | null
-export type Spec22 = {
+export type Description23 = string | null
+export type Spec23 = {
   [k: string]: unknown
 } | null
 export type Regex = string
@@ -215,7 +222,8 @@ export type Fallback =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -294,7 +302,8 @@ export type Fallback1 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -351,7 +360,8 @@ export type Program1 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -404,7 +414,8 @@ export type Fallback2 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -457,7 +468,8 @@ export type PdlTrace =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -510,7 +522,8 @@ export type Fallback3 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -563,7 +576,8 @@ export type PdlTrace1 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -616,7 +630,8 @@ export type Fallback4 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -706,7 +721,8 @@ export type Fallback5 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -757,7 +773,8 @@ export type Content =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -818,7 +835,8 @@ export type Fallback6 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -868,7 +886,8 @@ export type Object =
         | CallBlock
         | LitellmModelBlock
         | GraniteioModelBlock
-        | CodeBlock
+        | PythonCodeBlock
+        | NonPythonCodeBlock
         | ArgsBlock
         | GetBlock
         | DataBlock
@@ -895,7 +914,8 @@ export type Object =
       | CallBlock
       | LitellmModelBlock
       | GraniteioModelBlock
-      | CodeBlock
+      | PythonCodeBlock
+      | NonPythonCodeBlock
       | ArgsBlock
       | GetBlock
       | DataBlock
@@ -949,7 +969,8 @@ export type Fallback7 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1000,7 +1021,8 @@ export type Array = (
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1054,7 +1076,8 @@ export type Fallback8 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1105,7 +1128,8 @@ export type Lastof = (
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1159,7 +1183,8 @@ export type Fallback9 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1211,7 +1236,8 @@ export type Text =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1236,7 +1262,8 @@ export type Text =
       | CallBlock
       | LitellmModelBlock
       | GraniteioModelBlock
-      | CodeBlock
+      | PythonCodeBlock
+      | NonPythonCodeBlock
       | ArgsBlock
       | GetBlock
       | DataBlock
@@ -1291,7 +1318,8 @@ export type Fallback10 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1355,7 +1383,8 @@ export type Repeat =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1422,7 +1451,8 @@ export type PdlTrace2 =
       | CallBlock
       | LitellmModelBlock
       | GraniteioModelBlock
-      | CodeBlock
+      | PythonCodeBlock
+      | NonPythonCodeBlock
       | ArgsBlock
       | GetBlock
       | DataBlock
@@ -1477,7 +1507,8 @@ export type Fallback11 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1560,7 +1591,8 @@ export type Then =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1621,7 +1653,8 @@ export type Fallback12 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1678,7 +1711,8 @@ export type Then1 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1708,7 +1742,8 @@ export type Else =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1762,7 +1797,8 @@ export type Fallback13 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1841,7 +1877,8 @@ export type Fallback14 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -1920,7 +1957,8 @@ export type Fallback15 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2001,7 +2039,8 @@ export type Fallback16 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2041,11 +2080,6 @@ export type Context16 =
 export type PdlId16 = string | null
 export type PdlIsLeaf16 = true
 export type Kind16 = "code"
-/**
- * Programming language of the code.
- *
- */
-export type Lang1 = "python" | "command" | "jinja" | "pdl"
 /**
  * Code to execute.
  *
@@ -2058,7 +2092,8 @@ export type Code =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2076,6 +2111,11 @@ export type Code =
   | ErrorBlock
   | EmptyBlock
   | null
+/**
+ * Programming language of the code.
+ *
+ */
+export type Lang1 = "command" | "jinja" | "pdl"
 /**
  * Name of the variable used to store the result of the execution of the block.
  *
@@ -2111,7 +2151,8 @@ export type Fallback17 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2150,7 +2191,124 @@ export type Context17 =
  */
 export type PdlId17 = string | null
 export type PdlIsLeaf17 = true
-export type Kind17 = "model"
+export type Kind17 = "code"
+/**
+ * Code to execute.
+ *
+ */
+export type Code1 =
+  | boolean
+  | number
+  | string
+  | FunctionBlock
+  | CallBlock
+  | LitellmModelBlock
+  | GraniteioModelBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
+  | ArgsBlock
+  | GetBlock
+  | DataBlock
+  | IfBlock
+  | MatchBlock
+  | RepeatBlock
+  | TextBlock
+  | LastOfBlock
+  | ArrayBlock
+  | ObjectBlock
+  | MessageBlock
+  | ReadBlock
+  | IncludeBlock
+  | ImportBlock
+  | ErrorBlock
+  | EmptyBlock
+  | null
+/**
+ * Programming language of the code.
+ *
+ */
+export type Lang2 = "python"
+/**
+ * Pip requirements.txt
+ *
+ */
+export type Requirements = string | string[] | null
+/**
+ * Name of the variable used to store the result of the execution of the block.
+ *
+ */
+export type Def22 = string | null
+/**
+ * Indicate if the block contributes to the result and background context.
+ *
+ */
+export type Contribute18 = (
+  | ContributeTarget
+  | {
+      [k: string]: ContributeValue
+    }
+)[]
+/**
+ * Parser to use to construct a value out of a string result.
+ */
+export type Parser18 =
+  | ("json" | "jsonl" | "yaml")
+  | PdlParser
+  | RegexParser
+  | null
+/**
+ * Block to execute in case of error.
+ *
+ */
+export type Fallback18 =
+  | boolean
+  | number
+  | string
+  | FunctionBlock
+  | CallBlock
+  | LitellmModelBlock
+  | GraniteioModelBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
+  | ArgsBlock
+  | GetBlock
+  | DataBlock
+  | IfBlock
+  | MatchBlock
+  | RepeatBlock
+  | TextBlock
+  | LastOfBlock
+  | ArrayBlock
+  | ObjectBlock
+  | MessageBlock
+  | ReadBlock
+  | IncludeBlock
+  | ImportBlock
+  | ErrorBlock
+  | EmptyBlock
+  | null
+/**
+ * Role associated to the block and sub-blocks.
+ * Typical roles are `system`, `user`, and `assistant`,
+ * but there may be other roles such as `available_tools`.
+ */
+export type Role18 = string | null
+/**
+ * Current context
+ *
+ */
+export type Context18 =
+  | {
+      [k: string]: unknown
+    }[]
+  | null
+/**
+ * Unique identifier for this block
+ *
+ */
+export type PdlId18 = string | null
+export type PdlIsLeaf18 = true
+export type Kind18 = "model"
 /**
  * Messages to send to the model.
  *
@@ -2163,7 +2321,8 @@ export type Input =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2228,12 +2387,12 @@ export type Parameters =
  * Name of the variable used to store the result of the execution of the block.
  *
  */
-export type Def22 = string | null
+export type Def23 = string | null
 /**
  * Indicate if the block contributes to the result and background context.
  *
  */
-export type Contribute18 = (
+export type Contribute19 = (
   | ContributeTarget
   | {
       [k: string]: ContributeValue
@@ -2242,7 +2401,7 @@ export type Contribute18 = (
 /**
  * Parser to use to construct a value out of a string result.
  */
-export type Parser18 =
+export type Parser19 =
   | ("json" | "jsonl" | "yaml")
   | PdlParser
   | RegexParser
@@ -2251,7 +2410,7 @@ export type Parser18 =
  * Block to execute in case of error.
  *
  */
-export type Fallback18 =
+export type Fallback19 =
   | boolean
   | number
   | string
@@ -2259,7 +2418,8 @@ export type Fallback18 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2282,12 +2442,12 @@ export type Fallback18 =
  * Typical roles are `system`, `user`, and `assistant`,
  * but there may be other roles such as `available_tools`.
  */
-export type Role18 = string | null
+export type Role19 = string | null
 /**
  * Current context
  *
  */
-export type Context18 =
+export type Context19 =
   | {
       [k: string]: unknown
     }[]
@@ -2296,9 +2456,9 @@ export type Context18 =
  * Unique identifier for this block
  *
  */
-export type PdlId18 = string | null
-export type PdlIsLeaf18 = true
-export type Kind18 = "model"
+export type PdlId19 = string | null
+export type PdlIsLeaf19 = true
+export type Kind19 = "model"
 /**
  * Name of the model following the LiteLLM convention.
  *
@@ -2316,7 +2476,8 @@ export type Input1 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2412,12 +2573,12 @@ export type MaxRetries = number | string | null
  * Name of the variable used to store the result of the execution of the block.
  *
  */
-export type Def23 = string | null
+export type Def24 = string | null
 /**
  * Indicate if the block contributes to the result and background context.
  *
  */
-export type Contribute19 = (
+export type Contribute20 = (
   | ContributeTarget
   | {
       [k: string]: ContributeValue
@@ -2426,7 +2587,7 @@ export type Contribute19 = (
 /**
  * Parser to use to construct a value out of a string result.
  */
-export type Parser19 =
+export type Parser20 =
   | ("json" | "jsonl" | "yaml")
   | PdlParser
   | RegexParser
@@ -2435,7 +2596,7 @@ export type Parser19 =
  * Block to execute in case of error.
  *
  */
-export type Fallback19 =
+export type Fallback20 =
   | boolean
   | number
   | string
@@ -2443,7 +2604,8 @@ export type Fallback19 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2466,12 +2628,12 @@ export type Fallback19 =
  * Typical roles are `system`, `user`, and `assistant`,
  * but there may be other roles such as `available_tools`.
  */
-export type Role19 = string | null
+export type Role20 = string | null
 /**
  * Current context
  *
  */
-export type Context19 =
+export type Context20 =
   | {
       [k: string]: unknown
     }[]
@@ -2480,9 +2642,9 @@ export type Context19 =
  * Unique identifier for this block
  *
  */
-export type PdlId19 = string | null
-export type PdlIsLeaf19 = true
-export type Kind19 = "call"
+export type PdlId20 = string | null
+export type PdlIsLeaf20 = true
+export type Kind20 = "call"
 export type PdlTrace3 =
   | boolean
   | number
@@ -2491,7 +2653,8 @@ export type PdlTrace3 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2513,12 +2676,12 @@ export type PdlTrace3 =
  * Name of the variable used to store the result of the execution of the block.
  *
  */
-export type Def24 = string | null
+export type Def25 = string | null
 /**
  * Indicate if the block contributes to the result and background context.
  *
  */
-export type Contribute20 = (
+export type Contribute21 = (
   | ContributeTarget
   | {
       [k: string]: ContributeValue
@@ -2527,7 +2690,7 @@ export type Contribute20 = (
 /**
  * Parser to use to construct a value out of a string result.
  */
-export type Parser20 =
+export type Parser21 =
   | ("json" | "jsonl" | "yaml")
   | PdlParser
   | RegexParser
@@ -2536,7 +2699,7 @@ export type Parser20 =
  * Block to execute in case of error.
  *
  */
-export type Fallback20 =
+export type Fallback21 =
   | boolean
   | number
   | string
@@ -2544,7 +2707,8 @@ export type Fallback20 =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2567,12 +2731,12 @@ export type Fallback20 =
  * Typical roles are `system`, `user`, and `assistant`,
  * but there may be other roles such as `available_tools`.
  */
-export type Role20 = string | null
+export type Role21 = string | null
 /**
  * Current context
  *
  */
-export type Context20 =
+export type Context21 =
   | {
       [k: string]: unknown
     }[]
@@ -2581,9 +2745,9 @@ export type Context20 =
  * Unique identifier for this block
  *
  */
-export type PdlId20 = string | null
-export type PdlIsLeaf20 = true
-export type Kind20 = "function"
+export type PdlId21 = string | null
+export type PdlIsLeaf21 = true
+export type Kind21 = "function"
 /**
  * Functions parameters with their types.
  *
@@ -2603,7 +2767,8 @@ export type Return =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2629,7 +2794,8 @@ export type PdlBlock =
   | CallBlock
   | LitellmModelBlock
   | GraniteioModelBlock
-  | CodeBlock
+  | PythonCodeBlock
+  | NonPythonCodeBlock
   | ArgsBlock
   | GetBlock
   | DataBlock
@@ -2655,18 +2821,18 @@ export interface FunctionBlock {
   description?: Description
   spec?: Spec
   defs?: Defs
-  def?: Def24
-  contribute?: Contribute20
-  parser?: Parser20
-  fallback?: Fallback20
-  role?: Role20
-  context?: Context20
-  pdl__id?: PdlId20
+  def?: Def25
+  contribute?: Contribute21
+  parser?: Parser21
+  fallback?: Fallback21
+  role?: Role21
+  context?: Context21
+  pdl__id?: PdlId21
   pdl__result?: unknown
   pdl__location?: PdlLocationType | null
   pdl__timing?: PdlTiming | null
-  pdl__is_leaf?: PdlIsLeaf20
-  kind?: Kind20
+  pdl__is_leaf?: PdlIsLeaf21
+  kind?: Kind21
   function: Function
   return: Return
 }
@@ -2690,7 +2856,8 @@ export interface Defs {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -2716,18 +2883,18 @@ export interface CallBlock {
   description?: Description1
   spec?: Spec1
   defs?: Defs1
-  def?: Def23
-  contribute?: Contribute19
-  parser?: Parser19
-  fallback?: Fallback19
-  role?: Role19
-  context?: Context19
-  pdl__id?: PdlId19
+  def?: Def24
+  contribute?: Contribute20
+  parser?: Parser20
+  fallback?: Fallback20
+  role?: Role20
+  context?: Context20
+  pdl__id?: PdlId20
   pdl__result?: unknown
   pdl__location?: PdlLocationType | null
   pdl__timing?: PdlTiming | null
-  pdl__is_leaf?: PdlIsLeaf19
-  kind?: Kind19
+  pdl__is_leaf?: PdlIsLeaf20
+  kind?: Kind20
   call: unknown
   args?: unknown
   pdl__trace?: PdlTrace3
@@ -2752,7 +2919,8 @@ export interface Defs1 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -2785,18 +2953,18 @@ export interface LitellmModelBlock {
   description?: Description2
   spec?: Spec2
   defs?: Defs2
-  def?: Def22
-  contribute?: Contribute18
-  parser?: Parser18
-  fallback?: Fallback18
-  role?: Role18
-  context?: Context18
-  pdl__id?: PdlId18
+  def?: Def23
+  contribute?: Contribute19
+  parser?: Parser19
+  fallback?: Fallback19
+  role?: Role19
+  context?: Context19
+  pdl__id?: PdlId19
   pdl__result?: unknown
   pdl__location?: PdlLocationType | null
   pdl__timing?: PdlTiming | null
-  pdl__is_leaf?: PdlIsLeaf18
-  kind?: Kind18
+  pdl__is_leaf?: PdlIsLeaf19
+  kind?: Kind19
   model: Model1
   input?: Input1
   modelResponse?: Modelresponse1
@@ -2829,7 +2997,8 @@ export interface Defs2 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -2855,18 +3024,18 @@ export interface GraniteioModelBlock {
   description?: Description3
   spec?: Spec3
   defs?: Defs3
-  def?: Def21
-  contribute?: Contribute17
-  parser?: Parser17
-  fallback?: Fallback17
-  role?: Role17
-  context?: Context17
-  pdl__id?: PdlId17
+  def?: Def22
+  contribute?: Contribute18
+  parser?: Parser18
+  fallback?: Fallback18
+  role?: Role18
+  context?: Context18
+  pdl__id?: PdlId18
   pdl__result?: unknown
   pdl__location?: PdlLocationType | null
   pdl__timing?: PdlTiming | null
-  pdl__is_leaf?: PdlIsLeaf17
-  kind?: Kind17
+  pdl__is_leaf?: PdlIsLeaf18
+  kind?: Kind18
   model: unknown
   input?: Input
   modelResponse?: Modelresponse
@@ -2901,7 +3070,8 @@ export interface Defs3 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -2921,21 +3091,92 @@ export interface Defs3 {
     | null
 }
 /**
- * Execute a piece of code.
+ * Execute a piece of Python code.
  *
  * Example:
  * ```PDL
- * lang: python
- * code: |
+ * - def: N
+ *   lang: python
+ *   code: |
  *     import random
  *     # (In PDL, set `result` to the output you wish for your code block.)
  *     result = random.randint(1, 20)
  * ```
  */
-export interface CodeBlock {
+export interface PythonCodeBlock {
   description?: Description4
   spec?: Spec4
   defs?: Defs4
+  def?: Def21
+  contribute?: Contribute17
+  parser?: Parser17
+  fallback?: Fallback17
+  role?: Role17
+  context?: Context17
+  pdl__id?: PdlId17
+  pdl__result?: unknown
+  pdl__location?: PdlLocationType | null
+  pdl__timing?: PdlTiming | null
+  pdl__is_leaf?: PdlIsLeaf17
+  kind?: Kind17
+  code: Code1
+  lang?: Lang2
+  requirements?: Requirements
+}
+/**
+ * Type specification of the result of the block.
+ *
+ */
+export interface Spec4 {
+  [k: string]: unknown
+}
+/**
+ * Set of definitions executed before the execution of the block.
+ *
+ */
+export interface Defs4 {
+  [k: string]:
+    | boolean
+    | number
+    | string
+    | FunctionBlock
+    | CallBlock
+    | LitellmModelBlock
+    | GraniteioModelBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
+    | ArgsBlock
+    | GetBlock
+    | DataBlock
+    | IfBlock
+    | MatchBlock
+    | RepeatBlock
+    | TextBlock
+    | LastOfBlock
+    | ArrayBlock
+    | ObjectBlock
+    | MessageBlock
+    | ReadBlock
+    | IncludeBlock
+    | ImportBlock
+    | ErrorBlock
+    | EmptyBlock
+    | null
+}
+/**
+ * Execute a piece of code.
+ *
+ * Example:
+ * ```PDL
+ * - def: N
+ *   lang: command
+ *   code: echo hi
+ * ```
+ */
+export interface NonPythonCodeBlock {
+  description?: Description5
+  spec?: Spec5
+  defs?: Defs5
   def?: Def20
   contribute?: Contribute16
   parser?: Parser16
@@ -2948,21 +3189,21 @@ export interface CodeBlock {
   pdl__timing?: PdlTiming | null
   pdl__is_leaf?: PdlIsLeaf16
   kind?: Kind16
-  lang: Lang1
   code: Code
+  lang: Lang1
 }
 /**
  * Type specification of the result of the block.
  *
  */
-export interface Spec4 {
+export interface Spec5 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs4 {
+export interface Defs5 {
   [k: string]:
     | boolean
     | number
@@ -2971,7 +3212,8 @@ export interface Defs4 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3002,9 +3244,9 @@ export interface Defs4 {
  * ```
  */
 export interface ArgsBlock {
-  description?: Description5
-  spec?: Spec5
-  defs?: Defs5
+  description?: Description6
+  spec?: Spec6
+  defs?: Defs6
   def?: Def19
   contribute?: Contribute15
   parser?: Parser15
@@ -3024,14 +3266,14 @@ export interface ArgsBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec5 {
+export interface Spec6 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs5 {
+export interface Defs6 {
   [k: string]:
     | boolean
     | number
@@ -3040,7 +3282,8 @@ export interface Defs5 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3065,9 +3308,9 @@ export interface Defs5 {
  * The GetBlock is deprecated.  Use DataBlock instead.
  */
 export interface GetBlock {
-  description?: Description6
-  spec?: Spec6
-  defs?: Defs6
+  description?: Description7
+  spec?: Spec7
+  defs?: Defs7
   def?: Def18
   contribute?: Contribute14
   parser?: Parser14
@@ -3086,14 +3329,14 @@ export interface GetBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec6 {
+export interface Spec7 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs6 {
+export interface Defs7 {
   [k: string]:
     | boolean
     | number
@@ -3102,7 +3345,8 @@ export interface Defs6 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3146,9 +3390,9 @@ export interface Defs6 {
  * ```
  */
 export interface DataBlock {
-  description?: Description7
-  spec?: Spec7
-  defs?: Defs7
+  description?: Description8
+  spec?: Spec8
+  defs?: Defs8
   def?: Def17
   contribute?: Contribute13
   parser?: Parser13
@@ -3168,14 +3412,14 @@ export interface DataBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec7 {
+export interface Spec8 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs7 {
+export interface Defs8 {
   [k: string]:
     | boolean
     | number
@@ -3184,7 +3428,8 @@ export interface Defs7 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3217,9 +3462,9 @@ export interface Defs7 {
  * ```
  */
 export interface IfBlock {
-  description?: Description8
-  spec?: Spec8
-  defs?: Defs8
+  description?: Description9
+  spec?: Spec9
+  defs?: Defs9
   def?: Def16
   contribute?: Contribute12
   parser?: Parser12
@@ -3241,14 +3486,14 @@ export interface IfBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec8 {
+export interface Spec9 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs8 {
+export interface Defs9 {
   [k: string]:
     | boolean
     | number
@@ -3257,7 +3502,8 @@ export interface Defs8 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3297,9 +3543,9 @@ export interface Defs8 {
  * - then: Too low
  */
 export interface MatchBlock {
-  description?: Description9
-  spec?: Spec9
-  defs?: Defs9
+  description?: Description10
+  spec?: Spec10
+  defs?: Defs10
   def?: Def11
   contribute?: Contribute11
   parser?: Parser11
@@ -3319,14 +3565,14 @@ export interface MatchBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec9 {
+export interface Spec10 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs9 {
+export interface Defs10 {
   [k: string]:
     | boolean
     | number
@@ -3335,7 +3581,8 @@ export interface Defs9 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3367,9 +3614,9 @@ export interface Defs9 {
  * ```
  */
 export interface RepeatBlock {
-  description?: Description10
-  spec?: Spec10
-  defs?: Defs10
+  description?: Description11
+  spec?: Spec11
+  defs?: Defs11
   def?: Def10
   contribute?: Contribute10
   parser?: Parser10
@@ -3394,14 +3641,14 @@ export interface RepeatBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec10 {
+export interface Spec11 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs10 {
+export interface Defs11 {
   [k: string]:
     | boolean
     | number
@@ -3410,7 +3657,8 @@ export interface Defs10 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3433,9 +3681,9 @@ export interface Defs10 {
  * Create the concatenation of the stringify version of the result of each block of the list of blocks.
  */
 export interface TextBlock {
-  description?: Description11
-  spec?: Spec11
-  defs?: Defs11
+  description?: Description12
+  spec?: Spec12
+  defs?: Defs12
   def?: Def9
   contribute?: Contribute9
   parser?: Parser9
@@ -3454,14 +3702,14 @@ export interface TextBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec11 {
+export interface Spec12 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs11 {
+export interface Defs12 {
   [k: string]:
     | boolean
     | number
@@ -3470,7 +3718,8 @@ export interface Defs11 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3493,9 +3742,9 @@ export interface Defs11 {
  * Return the value of the last block if the list of blocks.
  */
 export interface LastOfBlock {
-  description?: Description12
-  spec?: Spec12
-  defs?: Defs12
+  description?: Description13
+  spec?: Spec13
+  defs?: Defs13
   def?: Def8
   contribute?: Contribute8
   parser?: Parser8
@@ -3514,14 +3763,14 @@ export interface LastOfBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec12 {
+export interface Spec13 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs12 {
+export interface Defs13 {
   [k: string]:
     | boolean
     | number
@@ -3530,7 +3779,8 @@ export interface Defs12 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3553,9 +3803,9 @@ export interface Defs12 {
  * Return the array of values computed by each block of the list of blocks.
  */
 export interface ArrayBlock {
-  description?: Description13
-  spec?: Spec13
-  defs?: Defs13
+  description?: Description14
+  spec?: Spec14
+  defs?: Defs14
   def?: Def7
   contribute?: Contribute7
   parser?: Parser7
@@ -3574,14 +3824,14 @@ export interface ArrayBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec13 {
+export interface Spec14 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs13 {
+export interface Defs14 {
   [k: string]:
     | boolean
     | number
@@ -3590,7 +3840,8 @@ export interface Defs13 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3613,9 +3864,9 @@ export interface Defs13 {
  * Return the object where the value of each field is defined by a block. If the body of the object is an array, the resulting object is the union of the objects computed by each element of the array.
  */
 export interface ObjectBlock {
-  description?: Description14
-  spec?: Spec14
-  defs?: Defs14
+  description?: Description15
+  spec?: Spec15
+  defs?: Defs15
   def?: Def6
   contribute?: Contribute6
   parser?: Parser6
@@ -3634,14 +3885,14 @@ export interface ObjectBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec14 {
+export interface Spec15 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs14 {
+export interface Defs15 {
   [k: string]:
     | boolean
     | number
@@ -3650,7 +3901,8 @@ export interface Defs14 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3673,9 +3925,9 @@ export interface Defs14 {
  * Create a message.
  */
 export interface MessageBlock {
-  description?: Description15
-  spec?: Spec15
-  defs?: Defs15
+  description?: Description16
+  spec?: Spec16
+  defs?: Defs16
   def?: Def5
   contribute?: Contribute5
   parser?: Parser5
@@ -3696,14 +3948,14 @@ export interface MessageBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec15 {
+export interface Spec16 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs15 {
+export interface Defs16 {
   [k: string]:
     | boolean
     | number
@@ -3712,7 +3964,8 @@ export interface Defs15 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3747,9 +4000,9 @@ export interface Defs15 {
  * ```
  */
 export interface ReadBlock {
-  description?: Description16
-  spec?: Spec16
-  defs?: Defs16
+  description?: Description17
+  spec?: Spec17
+  defs?: Defs17
   def?: Def4
   contribute?: Contribute4
   parser?: Parser4
@@ -3770,14 +4023,14 @@ export interface ReadBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec16 {
+export interface Spec17 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs16 {
+export interface Defs17 {
   [k: string]:
     | boolean
     | number
@@ -3786,7 +4039,8 @@ export interface Defs16 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3809,9 +4063,9 @@ export interface Defs16 {
  * Include a PDL file.
  */
 export interface IncludeBlock {
-  description?: Description17
-  spec?: Spec17
-  defs?: Defs17
+  description?: Description18
+  spec?: Spec18
+  defs?: Defs18
   def?: Def3
   contribute?: Contribute3
   parser?: Parser3
@@ -3831,14 +4085,14 @@ export interface IncludeBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec17 {
+export interface Spec18 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs17 {
+export interface Defs18 {
   [k: string]:
     | boolean
     | number
@@ -3847,7 +4101,8 @@ export interface Defs17 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3870,9 +4125,9 @@ export interface Defs17 {
  * Import a PDL file.
  */
 export interface ImportBlock {
-  description?: Description18
-  spec?: Spec18
-  defs?: Defs18
+  description?: Description19
+  spec?: Spec19
+  defs?: Defs19
   def?: Def2
   contribute?: Contribute2
   parser?: Parser2
@@ -3892,14 +4147,14 @@ export interface ImportBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec18 {
+export interface Spec19 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs18 {
+export interface Defs19 {
   [k: string]:
     | boolean
     | number
@@ -3908,7 +4163,8 @@ export interface Defs18 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3931,9 +4187,9 @@ export interface Defs18 {
  * Block representing an error generated at runtime.
  */
 export interface ErrorBlock {
-  description?: Description19
-  spec?: Spec19
-  defs?: Defs19
+  description?: Description20
+  spec?: Spec20
+  defs?: Defs20
   def?: Def1
   contribute?: Contribute1
   parser?: Parser1
@@ -3953,14 +4209,14 @@ export interface ErrorBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec19 {
+export interface Spec20 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs19 {
+export interface Defs20 {
   [k: string]:
     | boolean
     | number
@@ -3969,7 +4225,8 @@ export interface Defs19 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -3992,9 +4249,9 @@ export interface Defs19 {
  * Block without an action. It can contain definitions.
  */
 export interface EmptyBlock {
-  description?: Description20
-  spec?: Spec20
-  defs?: Defs20
+  description?: Description21
+  spec?: Spec21
+  defs?: Defs21
   def?: Def
   contribute?: Contribute
   parser?: Parser
@@ -4012,14 +4269,14 @@ export interface EmptyBlock {
  * Type specification of the result of the block.
  *
  */
-export interface Spec20 {
+export interface Spec21 {
   [k: string]: unknown
 }
 /**
  * Set of definitions executed before the execution of the block.
  *
  */
-export interface Defs20 {
+export interface Defs21 {
   [k: string]:
     | boolean
     | number
@@ -4028,7 +4285,8 @@ export interface Defs20 {
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
@@ -4070,16 +4328,16 @@ export interface Table {
   [k: string]: number
 }
 export interface PdlParser {
-  description?: Description21
-  spec?: Spec21
+  description?: Description22
+  spec?: Spec22
   pdl: Pdl
 }
 /**
  * A regular expression parser
  */
 export interface RegexParser {
-  description?: Description22
-  spec?: Spec22
+  description?: Description23
+  spec?: Spec23
   regex: Regex
   mode?: Mode
 }
diff --git a/pdl-live-react/src/view/detail/kind/Code.tsx b/pdl-live-react/src/view/detail/kind/Code.tsx
index caf9dbe51..f19cc93c9 100644
--- a/pdl-live-react/src/view/detail/kind/Code.tsx
+++ b/pdl-live-react/src/view/detail/kind/Code.tsx
@@ -8,7 +8,8 @@ export default function CodeItems({
 }: {
   block:
     | import("../../../pdl_ast").ArgsBlock
-    | import("../../../pdl_ast").CodeBlock
+    | import("../../../pdl_ast").PythonCodeBlock
+    | import("../../../pdl_ast").NonPythonCodeBlock
 }) {
   const { lang } = block
   const code = isArgs(block) ? block.args.join(" ") : extractCode(block)
diff --git a/src/pdl/pdl-schema.json b/src/pdl/pdl-schema.json
index f85ce364e..9fb183c71 100644
--- a/src/pdl/pdl-schema.json
+++ b/src/pdl/pdl-schema.json
@@ -77,7 +77,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -223,7 +226,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -446,7 +452,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -592,7 +601,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -766,7 +778,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -938,7 +953,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -1084,7 +1102,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -1283,7 +1304,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -1347,9 +1371,42 @@
       "title": "CallBlock",
       "type": "object"
     },
-    "CodeBlock": {
+    "ContributeTarget": {
+      "enum": [
+        "result",
+        "context"
+      ],
+      "title": "ContributeTarget",
+      "type": "string"
+    },
+    "ContributeValue": {
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {
+              "items": {},
+              "type": "array"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "title": "Value"
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "title": "ContributeValue",
+      "type": "object"
+    },
+    "DataBlock": {
       "additionalProperties": false,
-      "description": "Execute a piece of code.\n\nExample:\n```PDL\nlang: python\ncode: |\n    import random\n    # (In PDL, set `result` to the output you wish for your code block.)\n    result = random.randint(1, 20)\n```",
+      "description": "Arbitrary value, equivalent to JSON.\n\nExample. As part of a `defs` section, set `numbers` to the list `[1, 2, 3, 4]`:\n```PDL\ndefs:\n  numbers:\n    data: [1, 2, 3, 4]\n```\n\nExample.  Evaluate `${ TEST.answer }` in\n[Jinja](https://jinja.palletsprojects.com/en/stable/), passing\nthe result to a regex parser with capture groups.  Set\n`EXTRACTED_GROUND_TRUTH` to an object with attribute `answer`,\na string, containing the value of the capture group.\n```PDL\n- data: ${ TEST.answer }\n  parser:\n    regex: \"(.|\\n)*#### (?P<answer>([0-9])*)\\n*\"\n    spec:\n      answer: str\n  def: EXTRACTED_GROUND_TRUTH\n```",
       "properties": {
         "description": {
           "anyOf": [
@@ -1397,7 +1454,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -1543,7 +1603,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -1683,150 +1746,40 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "code",
-          "default": "code",
+          "const": "data",
+          "default": "data",
           "title": "Kind",
           "type": "string"
         },
-        "lang": {
-          "description": "Programming language of the code.\n    ",
-          "enum": [
-            "python",
-            "command",
-            "jinja",
-            "pdl"
-          ],
-          "title": "Lang",
-          "type": "string"
-        },
-        "code": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/FunctionBlock"
-            },
-            {
-              "$ref": "#/$defs/CallBlock"
-            },
-            {
-              "$ref": "#/$defs/LitellmModelBlock"
-            },
-            {
-              "$ref": "#/$defs/GraniteioModelBlock"
-            },
-            {
-              "$ref": "#/$defs/CodeBlock"
-            },
-            {
-              "$ref": "#/$defs/ArgsBlock"
-            },
-            {
-              "$ref": "#/$defs/GetBlock"
-            },
-            {
-              "$ref": "#/$defs/DataBlock"
-            },
-            {
-              "$ref": "#/$defs/IfBlock"
-            },
-            {
-              "$ref": "#/$defs/MatchBlock"
-            },
-            {
-              "$ref": "#/$defs/RepeatBlock"
-            },
-            {
-              "$ref": "#/$defs/TextBlock"
-            },
-            {
-              "$ref": "#/$defs/LastOfBlock"
-            },
-            {
-              "$ref": "#/$defs/ArrayBlock"
-            },
-            {
-              "$ref": "#/$defs/ObjectBlock"
-            },
-            {
-              "$ref": "#/$defs/MessageBlock"
-            },
-            {
-              "$ref": "#/$defs/ReadBlock"
-            },
-            {
-              "$ref": "#/$defs/IncludeBlock"
-            },
-            {
-              "$ref": "#/$defs/ImportBlock"
-            },
-            {
-              "$ref": "#/$defs/ErrorBlock"
-            },
-            {
-              "$ref": "#/$defs/EmptyBlock"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Code to execute.\n    ",
-          "title": "Code"
-        }
-      },
-      "required": [
-        "lang",
-        "code"
-      ],
-      "title": "CodeBlock",
-      "type": "object"
-    },
-    "ContributeTarget": {
-      "enum": [
-        "result",
-        "context"
-      ],
-      "title": "ContributeTarget",
-      "type": "string"
-    },
-    "ContributeValue": {
-      "additionalProperties": false,
-      "properties": {
-        "value": {
+        "data": {
           "anyOf": [
             {
               "$ref": "#/$defs/LocalizedExpression_TypeVar_"
             },
-            {
-              "items": {},
-              "type": "array"
-            },
+            {},
             {
               "type": "string"
             }
           ],
-          "title": "Value"
+          "description": "Value defined.",
+          "title": "Data"
+        },
+        "raw": {
+          "default": false,
+          "description": "Do not evaluate expressions inside strings.",
+          "title": "Raw",
+          "type": "boolean"
         }
       },
       "required": [
-        "value"
+        "data"
       ],
-      "title": "ContributeValue",
+      "title": "DataBlock",
       "type": "object"
     },
-    "DataBlock": {
+    "EmptyBlock": {
       "additionalProperties": false,
-      "description": "Arbitrary value, equivalent to JSON.\n\nExample. As part of a `defs` section, set `numbers` to the list `[1, 2, 3, 4]`:\n```PDL\ndefs:\n  numbers:\n    data: [1, 2, 3, 4]\n```\n\nExample.  Evaluate `${ TEST.answer }` in\n[Jinja](https://jinja.palletsprojects.com/en/stable/), passing\nthe result to a regex parser with capture groups.  Set\n`EXTRACTED_GROUND_TRUTH` to an object with attribute `answer`,\na string, containing the value of the capture group.\n```PDL\n- data: ${ TEST.answer }\n  parser:\n    regex: \"(.|\\n)*#### (?P<answer>([0-9])*)\\n*\"\n    spec:\n      answer: str\n  def: EXTRACTED_GROUND_TRUTH\n```",
+      "description": "Block without an action. It can contain definitions.",
       "properties": {
         "description": {
           "anyOf": [
@@ -1874,7 +1827,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -2020,7 +1976,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -2160,40 +2119,18 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "data",
-          "default": "data",
+          "const": "empty",
+          "default": "empty",
           "title": "Kind",
           "type": "string"
-        },
-        "data": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
-            },
-            {},
-            {
-              "type": "string"
-            }
-          ],
-          "description": "Value defined.",
-          "title": "Data"
-        },
-        "raw": {
-          "default": false,
-          "description": "Do not evaluate expressions inside strings.",
-          "title": "Raw",
-          "type": "boolean"
         }
       },
-      "required": [
-        "data"
-      ],
-      "title": "DataBlock",
+      "title": "EmptyBlock",
       "type": "object"
     },
-    "EmptyBlock": {
+    "ErrorBlock": {
       "additionalProperties": false,
-      "description": "Block without an action. It can contain definitions.",
+      "description": "Block representing an error generated at runtime.",
       "properties": {
         "description": {
           "anyOf": [
@@ -2241,7 +2178,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -2387,7 +2327,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -2527,23 +2470,119 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "empty",
-          "default": "empty",
+          "const": "error",
+          "default": "error",
           "title": "Kind",
           "type": "string"
-        }
-      },
-      "title": "EmptyBlock",
-      "type": "object"
-    },
-    "ErrorBlock": {
-      "additionalProperties": false,
-      "description": "Block representing an error generated at runtime.",
-      "properties": {
-        "description": {
+        },
+        "msg": {
+          "description": "Error message.\n    ",
+          "title": "Msg",
+          "type": "string"
+        },
+        "program": {
           "anyOf": [
             {
-              "type": "string"
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Block that raised the error.\n    ",
+          "title": "Program"
+        }
+      },
+      "required": [
+        "msg",
+        "program"
+      ],
+      "title": "ErrorBlock",
+      "type": "object"
+    },
+    "FunctionBlock": {
+      "additionalProperties": false,
+      "description": "Function declaration.",
+      "properties": {
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
             },
             {
               "type": "null"
@@ -2586,7 +2625,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -2732,7 +2774,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -2872,17 +2917,24 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "error",
-          "default": "error",
+          "const": "function",
+          "default": "function",
           "title": "Kind",
           "type": "string"
         },
-        "msg": {
-          "description": "Error message.\n    ",
-          "title": "Msg",
-          "type": "string"
+        "function": {
+          "anyOf": [
+            {
+              "type": "object"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Functions parameters with their types.\n    ",
+          "title": "Function"
         },
-        "program": {
+        "return": {
           "anyOf": [
             {
               "type": "boolean"
@@ -2909,7 +2961,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -2963,20 +3018,20 @@
               "type": "null"
             }
           ],
-          "description": "Block that raised the error.\n    ",
-          "title": "Program"
+          "description": "Body of the function\n    ",
+          "title": "Return"
         }
       },
       "required": [
-        "msg",
-        "program"
+        "function",
+        "return"
       ],
-      "title": "ErrorBlock",
+      "title": "FunctionBlock",
       "type": "object"
     },
-    "FunctionBlock": {
+    "GetBlock": {
       "additionalProperties": false,
-      "description": "Function declaration.",
+      "description": "Get the value of a variable.\n\nThe GetBlock is deprecated.  Use DataBlock instead.",
       "properties": {
         "description": {
           "anyOf": [
@@ -3024,7 +3079,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -3170,7 +3228,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -3310,118 +3371,26 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "function",
-          "default": "function",
+          "const": "get",
+          "default": "get",
           "title": "Kind",
           "type": "string"
         },
-        "function": {
-          "anyOf": [
-            {
-              "type": "object"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Functions parameters with their types.\n    ",
-          "title": "Function"
-        },
-        "return": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/FunctionBlock"
-            },
-            {
-              "$ref": "#/$defs/CallBlock"
-            },
-            {
-              "$ref": "#/$defs/LitellmModelBlock"
-            },
-            {
-              "$ref": "#/$defs/GraniteioModelBlock"
-            },
-            {
-              "$ref": "#/$defs/CodeBlock"
-            },
-            {
-              "$ref": "#/$defs/ArgsBlock"
-            },
-            {
-              "$ref": "#/$defs/GetBlock"
-            },
-            {
-              "$ref": "#/$defs/DataBlock"
-            },
-            {
-              "$ref": "#/$defs/IfBlock"
-            },
-            {
-              "$ref": "#/$defs/MatchBlock"
-            },
-            {
-              "$ref": "#/$defs/RepeatBlock"
-            },
-            {
-              "$ref": "#/$defs/TextBlock"
-            },
-            {
-              "$ref": "#/$defs/LastOfBlock"
-            },
-            {
-              "$ref": "#/$defs/ArrayBlock"
-            },
-            {
-              "$ref": "#/$defs/ObjectBlock"
-            },
-            {
-              "$ref": "#/$defs/MessageBlock"
-            },
-            {
-              "$ref": "#/$defs/ReadBlock"
-            },
-            {
-              "$ref": "#/$defs/IncludeBlock"
-            },
-            {
-              "$ref": "#/$defs/ImportBlock"
-            },
-            {
-              "$ref": "#/$defs/ErrorBlock"
-            },
-            {
-              "$ref": "#/$defs/EmptyBlock"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Body of the function\n    ",
-          "title": "Return"
+        "get": {
+          "description": "Name of the variable to access.",
+          "title": "Get",
+          "type": "string"
         }
       },
       "required": [
-        "function",
-        "return"
+        "get"
       ],
-      "title": "FunctionBlock",
+      "title": "GetBlock",
       "type": "object"
     },
-    "GetBlock": {
+    "GraniteioModelBlock": {
       "additionalProperties": false,
-      "description": "Get the value of a variable.\n\nThe GetBlock is deprecated.  Use DataBlock instead.",
+      "description": "Call an LLM through the granite-io API.",
       "properties": {
         "description": {
           "anyOf": [
@@ -3469,7 +3438,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -3615,10 +3587,13 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
             },
             {
-              "$ref": "#/$defs/ArgsBlock"
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
             },
             {
               "$ref": "#/$defs/GetBlock"
@@ -3755,26 +3730,220 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "get",
-          "default": "get",
+          "const": "model",
+          "default": "model",
           "title": "Kind",
           "type": "string"
         },
-        "get": {
-          "description": "Name of the variable to access.",
-          "title": "Get",
+        "model": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {},
+            {
+              "type": "string"
+            }
+          ],
+          "description": "Model name used by the backend.\n    ",
+          "title": "Model"
+        },
+        "input": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "${ pdl_context }",
+          "description": "Messages to send to the model.\n    ",
+          "title": "Input"
+        },
+        "modelResponse": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Variable where to store the raw response of the model.\n    ",
+          "title": "Modelresponse"
+        },
+        "pdl__usage": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/PdlUsage"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Tokens consumed during model call\n    "
+        },
+        "pdl__model_input": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "object"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Pdl  Model Input"
+        },
+        "platform": {
+          "const": "granite-io",
+          "default": "granite-io",
+          "description": "Optional field to ensure that the block is using granite-io.\n    ",
+          "title": "Platform",
           "type": "string"
+        },
+        "backend": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "type": "object"
+            }
+          ],
+          "description": "Backend name and configuration.\n    ",
+          "title": "Backend"
+        },
+        "processor": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "IO Processor name.\n    ",
+          "title": "Processor"
+        },
+        "parameters": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {
+              "type": "object"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Parameters sent to the model.\n    ",
+          "title": "Parameters"
         }
       },
       "required": [
-        "get"
+        "model",
+        "backend"
       ],
-      "title": "GetBlock",
+      "title": "GraniteioModelBlock",
       "type": "object"
     },
-    "GraniteioModelBlock": {
+    "IfBlock": {
       "additionalProperties": false,
-      "description": "Call an LLM through the granite-io API.",
+      "description": "Conditional control structure.\n\nExample:\n```PDL\ndefs:\n  answer:\n    read:\n    message: \"Enter a number? \"\nif: ${ (answer | int) == 42 }\nthen: You won!\n```",
       "properties": {
         "description": {
           "anyOf": [
@@ -3822,7 +3991,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -3968,7 +4140,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -4102,31 +4277,33 @@
           "default": null
         },
         "pdl__is_leaf": {
-          "const": true,
-          "default": true,
+          "const": false,
+          "default": false,
           "title": "Pdl  Is Leaf",
           "type": "boolean"
         },
         "kind": {
-          "const": "model",
-          "default": "model",
+          "const": "if",
+          "default": "if",
           "title": "Kind",
           "type": "string"
         },
-        "model": {
+        "if": {
           "anyOf": [
             {
               "$ref": "#/$defs/LocalizedExpression_TypeVar_"
             },
-            {},
+            {
+              "type": "boolean"
+            },
             {
               "type": "string"
             }
           ],
-          "description": "Model name used by the backend.\n    ",
-          "title": "Model"
+          "description": "Condition.\n    ",
+          "title": "If"
         },
-        "input": {
+        "then": {
           "anyOf": [
             {
               "type": "boolean"
@@ -4153,7 +4330,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -4207,118 +4387,120 @@
               "type": "null"
             }
           ],
-          "default": "${ pdl_context }",
-          "description": "Messages to send to the model.\n    ",
-          "title": "Input"
+          "description": "Branch to execute if the condition is true.\n    ",
+          "title": "Then"
         },
-        "modelResponse": {
+        "else": {
           "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
             {
               "type": "string"
             },
             {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Variable where to store the raw response of the model.\n    ",
-          "title": "Modelresponse"
-        },
-        "pdl__usage": {
-          "anyOf": [
+              "$ref": "#/$defs/FunctionBlock"
+            },
             {
-              "$ref": "#/$defs/PdlUsage"
+              "$ref": "#/$defs/CallBlock"
             },
             {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Tokens consumed during model call\n    "
-        },
-        "pdl__model_input": {
-          "anyOf": [
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
             {
-              "items": {
-                "type": "object"
-              },
-              "type": "array"
+              "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Pdl  Model Input"
-        },
-        "platform": {
-          "const": "granite-io",
-          "default": "granite-io",
-          "description": "Optional field to ensure that the block is using granite-io.\n    ",
-          "title": "Platform",
-          "type": "string"
-        },
-        "backend": {
-          "anyOf": [
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
             {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/ArgsBlock"
             },
             {
-              "type": "object"
-            }
-          ],
-          "description": "Backend name and configuration.\n    ",
-          "title": "Backend"
-        },
-        "processor": {
-          "anyOf": [
+              "$ref": "#/$defs/GetBlock"
+            },
             {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+              "$ref": "#/$defs/DataBlock"
             },
             {
-              "type": "string"
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
             },
             {
               "type": "null"
             }
           ],
           "default": null,
-          "description": "IO Processor name.\n    ",
-          "title": "Processor"
+          "description": "Branch to execute if the condition is false.\n    ",
+          "title": "Else"
         },
-        "parameters": {
+        "if_result": {
           "anyOf": [
             {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
-            },
-            {
-              "type": "object"
-            },
-            {
-              "type": "string"
+              "type": "boolean"
             },
             {
               "type": "null"
             }
           ],
           "default": null,
-          "description": "Parameters sent to the model.\n    ",
-          "title": "Parameters"
+          "title": "If Result"
         }
       },
       "required": [
-        "model",
-        "backend"
+        "if",
+        "then"
       ],
-      "title": "GraniteioModelBlock",
+      "title": "IfBlock",
       "type": "object"
     },
-    "IfBlock": {
+    "ImportBlock": {
       "additionalProperties": false,
-      "description": "Conditional control structure.\n\nExample:\n```PDL\ndefs:\n  answer:\n    read:\n    message: \"Enter a number? \"\nif: ${ (answer | int) == 42 }\nthen: You won!\n```",
+      "description": "Import a PDL file.",
       "properties": {
         "description": {
           "anyOf": [
@@ -4366,7 +4548,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -4512,7 +4697,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -4646,33 +4834,23 @@
           "default": null
         },
         "pdl__is_leaf": {
-          "const": false,
-          "default": false,
+          "const": true,
+          "default": true,
           "title": "Pdl  Is Leaf",
           "type": "boolean"
         },
         "kind": {
-          "const": "if",
-          "default": "if",
+          "const": "import",
+          "default": "import",
           "title": "Kind",
           "type": "string"
         },
-        "if": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
-            },
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "string"
-            }
-          ],
-          "description": "Condition.\n    ",
-          "title": "If"
+        "import": {
+          "description": "Name of the file to import.\n    ",
+          "title": "Import",
+          "type": "string"
         },
-        "then": {
+        "pdl__trace": {
           "anyOf": [
             {
               "type": "boolean"
@@ -4699,91 +4877,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
-            },
-            {
-              "$ref": "#/$defs/ArgsBlock"
-            },
-            {
-              "$ref": "#/$defs/GetBlock"
-            },
-            {
-              "$ref": "#/$defs/DataBlock"
-            },
-            {
-              "$ref": "#/$defs/IfBlock"
-            },
-            {
-              "$ref": "#/$defs/MatchBlock"
-            },
-            {
-              "$ref": "#/$defs/RepeatBlock"
-            },
-            {
-              "$ref": "#/$defs/TextBlock"
-            },
-            {
-              "$ref": "#/$defs/LastOfBlock"
-            },
-            {
-              "$ref": "#/$defs/ArrayBlock"
-            },
-            {
-              "$ref": "#/$defs/ObjectBlock"
-            },
-            {
-              "$ref": "#/$defs/MessageBlock"
-            },
-            {
-              "$ref": "#/$defs/ReadBlock"
-            },
-            {
-              "$ref": "#/$defs/IncludeBlock"
-            },
-            {
-              "$ref": "#/$defs/ImportBlock"
-            },
-            {
-              "$ref": "#/$defs/ErrorBlock"
-            },
-            {
-              "$ref": "#/$defs/EmptyBlock"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Branch to execute if the condition is true.\n    ",
-          "title": "Then"
-        },
-        "else": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/FunctionBlock"
-            },
-            {
-              "$ref": "#/$defs/CallBlock"
-            },
-            {
-              "$ref": "#/$defs/LitellmModelBlock"
-            },
-            {
-              "$ref": "#/$defs/GraniteioModelBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -4838,37 +4935,23 @@
             }
           ],
           "default": null,
-          "description": "Branch to execute if the condition is false.\n    ",
-          "title": "Else"
-        },
-        "if_result": {
+          "title": "Pdl  Trace"
+        }
+      },
+      "required": [
+        "import"
+      ],
+      "title": "ImportBlock",
+      "type": "object"
+    },
+    "IncludeBlock": {
+      "additionalProperties": false,
+      "description": "Include a PDL file.",
+      "properties": {
+        "description": {
           "anyOf": [
             {
-              "type": "boolean"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "If Result"
-        }
-      },
-      "required": [
-        "if",
-        "then"
-      ],
-      "title": "IfBlock",
-      "type": "object"
-    },
-    "ImportBlock": {
-      "additionalProperties": false,
-      "description": "Import a PDL file.",
-      "properties": {
-        "description": {
-          "anyOf": [
-            {
-              "type": "string"
+              "type": "string"
             },
             {
               "type": "null"
@@ -4911,7 +4994,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -5057,7 +5143,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -5191,20 +5280,20 @@
           "default": null
         },
         "pdl__is_leaf": {
-          "const": true,
-          "default": true,
+          "const": false,
+          "default": false,
           "title": "Pdl  Is Leaf",
           "type": "boolean"
         },
         "kind": {
-          "const": "import",
-          "default": "import",
+          "const": "include",
+          "default": "include",
           "title": "Kind",
           "type": "string"
         },
-        "import": {
-          "description": "Name of the file to import.\n    ",
-          "title": "Import",
+        "include": {
+          "description": "Name of the file to include.\n    ",
+          "title": "Include",
           "type": "string"
         },
         "pdl__trace": {
@@ -5234,7 +5323,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -5293,14 +5385,82 @@
         }
       },
       "required": [
-        "import"
+        "include"
       ],
-      "title": "ImportBlock",
+      "title": "IncludeBlock",
       "type": "object"
     },
-    "IncludeBlock": {
+    "JoinArray": {
       "additionalProperties": false,
-      "description": "Include a PDL file.",
+      "properties": {
+        "as": {
+          "const": "array",
+          "description": "Return the result of each iteration as an array.\n    ",
+          "title": "As",
+          "type": "string"
+        }
+      },
+      "required": [
+        "as"
+      ],
+      "title": "JoinArray",
+      "type": "object"
+    },
+    "JoinLastOf": {
+      "additionalProperties": false,
+      "properties": {
+        "as": {
+          "const": "lastOf",
+          "description": "Return the result of the last iteration.\n    ",
+          "title": "As",
+          "type": "string"
+        }
+      },
+      "required": [
+        "as"
+      ],
+      "title": "JoinLastOf",
+      "type": "object"
+    },
+    "JoinObject": {
+      "additionalProperties": false,
+      "properties": {
+        "as": {
+          "const": "object",
+          "description": "Return the union of the objects created at each iteration.\n    ",
+          "title": "As",
+          "type": "string"
+        }
+      },
+      "required": [
+        "as"
+      ],
+      "title": "JoinObject",
+      "type": "object"
+    },
+    "JoinText": {
+      "additionalProperties": false,
+      "properties": {
+        "as": {
+          "const": "text",
+          "default": "text",
+          "description": "String concatenation of the result of each iteration.\n    ",
+          "title": "As",
+          "type": "string"
+        },
+        "with": {
+          "default": "",
+          "description": "String used to concatenate each iteration of the loop.\n    ",
+          "title": "With",
+          "type": "string"
+        }
+      },
+      "title": "JoinText",
+      "type": "object"
+    },
+    "LastOfBlock": {
+      "additionalProperties": false,
+      "description": "Return the value of the last block if the list of blocks.",
       "properties": {
         "description": {
           "anyOf": [
@@ -5348,7 +5508,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -5494,7 +5657,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -5634,180 +5800,113 @@
           "type": "boolean"
         },
         "kind": {
-          "const": "include",
-          "default": "include",
+          "const": "lastOf",
+          "default": "lastOf",
           "title": "Kind",
           "type": "string"
         },
-        "include": {
-          "description": "Name of the file to include.\n    ",
-          "title": "Include",
-          "type": "string"
-        },
-        "pdl__trace": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/FunctionBlock"
-            },
-            {
-              "$ref": "#/$defs/CallBlock"
-            },
-            {
-              "$ref": "#/$defs/LitellmModelBlock"
-            },
-            {
-              "$ref": "#/$defs/GraniteioModelBlock"
-            },
-            {
-              "$ref": "#/$defs/CodeBlock"
-            },
-            {
-              "$ref": "#/$defs/ArgsBlock"
-            },
-            {
-              "$ref": "#/$defs/GetBlock"
-            },
-            {
-              "$ref": "#/$defs/DataBlock"
-            },
-            {
-              "$ref": "#/$defs/IfBlock"
-            },
-            {
-              "$ref": "#/$defs/MatchBlock"
-            },
-            {
-              "$ref": "#/$defs/RepeatBlock"
-            },
-            {
-              "$ref": "#/$defs/TextBlock"
-            },
-            {
-              "$ref": "#/$defs/LastOfBlock"
-            },
-            {
-              "$ref": "#/$defs/ArrayBlock"
-            },
-            {
-              "$ref": "#/$defs/ObjectBlock"
-            },
-            {
-              "$ref": "#/$defs/MessageBlock"
-            },
-            {
-              "$ref": "#/$defs/ReadBlock"
-            },
-            {
-              "$ref": "#/$defs/IncludeBlock"
-            },
-            {
-              "$ref": "#/$defs/ImportBlock"
-            },
-            {
-              "$ref": "#/$defs/ErrorBlock"
-            },
-            {
-              "$ref": "#/$defs/EmptyBlock"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Pdl  Trace"
-        }
-      },
-      "required": [
-        "include"
-      ],
-      "title": "IncludeBlock",
-      "type": "object"
-    },
-    "JoinArray": {
-      "additionalProperties": false,
-      "properties": {
-        "as": {
-          "const": "array",
-          "description": "Return the result of each iteration as an array.\n    ",
-          "title": "As",
-          "type": "string"
-        }
-      },
-      "required": [
-        "as"
-      ],
-      "title": "JoinArray",
-      "type": "object"
-    },
-    "JoinLastOf": {
-      "additionalProperties": false,
-      "properties": {
-        "as": {
-          "const": "lastOf",
-          "description": "Return the result of the last iteration.\n    ",
-          "title": "As",
-          "type": "string"
-        }
-      },
-      "required": [
-        "as"
-      ],
-      "title": "JoinLastOf",
-      "type": "object"
-    },
-    "JoinObject": {
-      "additionalProperties": false,
-      "properties": {
-        "as": {
-          "const": "object",
-          "description": "Return the union of the objects created at each iteration.\n    ",
-          "title": "As",
-          "type": "string"
-        }
-      },
-      "required": [
-        "as"
-      ],
-      "title": "JoinObject",
-      "type": "object"
-    },
-    "JoinText": {
-      "additionalProperties": false,
-      "properties": {
-        "as": {
-          "const": "text",
-          "default": "text",
-          "description": "String concatenation of the result of each iteration.\n    ",
-          "title": "As",
-          "type": "string"
-        },
-        "with": {
-          "default": "",
-          "description": "String used to concatenate each iteration of the loop.\n    ",
-          "title": "With",
-          "type": "string"
-        }
-      },
-      "title": "JoinText",
-      "type": "object"
-    },
-    "LastOfBlock": {
-      "additionalProperties": false,
-      "description": "Return the value of the last block if the list of blocks.",
-      "properties": {
-        "description": {
+        "lastOf": {
+          "description": "Sequence of blocks to execute.",
+          "items": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "integer"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/$defs/FunctionBlock"
+              },
+              {
+                "$ref": "#/$defs/CallBlock"
+              },
+              {
+                "$ref": "#/$defs/LitellmModelBlock"
+              },
+              {
+                "$ref": "#/$defs/GraniteioModelBlock"
+              },
+              {
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/ArgsBlock"
+              },
+              {
+                "$ref": "#/$defs/GetBlock"
+              },
+              {
+                "$ref": "#/$defs/DataBlock"
+              },
+              {
+                "$ref": "#/$defs/IfBlock"
+              },
+              {
+                "$ref": "#/$defs/MatchBlock"
+              },
+              {
+                "$ref": "#/$defs/RepeatBlock"
+              },
+              {
+                "$ref": "#/$defs/TextBlock"
+              },
+              {
+                "$ref": "#/$defs/LastOfBlock"
+              },
+              {
+                "$ref": "#/$defs/ArrayBlock"
+              },
+              {
+                "$ref": "#/$defs/ObjectBlock"
+              },
+              {
+                "$ref": "#/$defs/MessageBlock"
+              },
+              {
+                "$ref": "#/$defs/ReadBlock"
+              },
+              {
+                "$ref": "#/$defs/IncludeBlock"
+              },
+              {
+                "$ref": "#/$defs/ImportBlock"
+              },
+              {
+                "$ref": "#/$defs/ErrorBlock"
+              },
+              {
+                "$ref": "#/$defs/EmptyBlock"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "title": "Lastof",
+          "type": "array"
+        }
+      },
+      "required": [
+        "lastOf"
+      ],
+      "title": "LastOfBlock",
+      "type": "object"
+    },
+    "LitellmModelBlock": {
+      "additionalProperties": false,
+      "description": "Call an LLM through [the LiteLLM API](https://docs.litellm.ai/).\n\nExample:\n```PDL\n- model: ollama/granite-code:8b\n  parameters:\n    stop: ['!']\n```",
+      "properties": {
+        "description": {
           "anyOf": [
             {
               "type": "string"
@@ -5853,7 +5952,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -5999,7 +6101,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -6133,281 +6238,30 @@
           "default": null
         },
         "pdl__is_leaf": {
-          "const": false,
-          "default": false,
+          "const": true,
+          "default": true,
           "title": "Pdl  Is Leaf",
           "type": "boolean"
         },
         "kind": {
-          "const": "lastOf",
-          "default": "lastOf",
+          "const": "model",
+          "default": "model",
           "title": "Kind",
           "type": "string"
         },
-        "lastOf": {
-          "description": "Sequence of blocks to execute.",
-          "items": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "integer"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/$defs/FunctionBlock"
-              },
-              {
-                "$ref": "#/$defs/CallBlock"
-              },
-              {
-                "$ref": "#/$defs/LitellmModelBlock"
-              },
-              {
-                "$ref": "#/$defs/GraniteioModelBlock"
-              },
-              {
-                "$ref": "#/$defs/CodeBlock"
-              },
-              {
-                "$ref": "#/$defs/ArgsBlock"
-              },
-              {
-                "$ref": "#/$defs/GetBlock"
-              },
-              {
-                "$ref": "#/$defs/DataBlock"
-              },
-              {
-                "$ref": "#/$defs/IfBlock"
-              },
-              {
-                "$ref": "#/$defs/MatchBlock"
-              },
-              {
-                "$ref": "#/$defs/RepeatBlock"
-              },
-              {
-                "$ref": "#/$defs/TextBlock"
-              },
-              {
-                "$ref": "#/$defs/LastOfBlock"
-              },
-              {
-                "$ref": "#/$defs/ArrayBlock"
-              },
-              {
-                "$ref": "#/$defs/ObjectBlock"
-              },
-              {
-                "$ref": "#/$defs/MessageBlock"
-              },
-              {
-                "$ref": "#/$defs/ReadBlock"
-              },
-              {
-                "$ref": "#/$defs/IncludeBlock"
-              },
-              {
-                "$ref": "#/$defs/ImportBlock"
-              },
-              {
-                "$ref": "#/$defs/ErrorBlock"
-              },
-              {
-                "$ref": "#/$defs/EmptyBlock"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "title": "Lastof",
-          "type": "array"
-        }
-      },
-      "required": [
-        "lastOf"
-      ],
-      "title": "LastOfBlock",
-      "type": "object"
-    },
-    "LitellmModelBlock": {
-      "additionalProperties": false,
-      "description": "Call an LLM through [the LiteLLM API](https://docs.litellm.ai/).\n\nExample:\n```PDL\n- model: ollama/granite-code:8b\n  parameters:\n    stop: ['!']\n```",
-      "properties": {
-        "description": {
+        "model": {
           "anyOf": [
             {
-              "type": "string"
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
             },
             {
-              "type": "null"
+              "type": "string"
             }
           ],
-          "default": null,
-          "description": "Documentation associated to the block.\n    ",
-          "title": "Description"
-        },
-        "spec": {
-          "default": null,
-          "description": "Type specification of the result of the block.\n    ",
-          "title": "Spec"
-        },
-        "defs": {
-          "additionalProperties": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "integer"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/$defs/FunctionBlock"
-              },
-              {
-                "$ref": "#/$defs/CallBlock"
-              },
-              {
-                "$ref": "#/$defs/LitellmModelBlock"
-              },
-              {
-                "$ref": "#/$defs/GraniteioModelBlock"
-              },
-              {
-                "$ref": "#/$defs/CodeBlock"
-              },
-              {
-                "$ref": "#/$defs/ArgsBlock"
-              },
-              {
-                "$ref": "#/$defs/GetBlock"
-              },
-              {
-                "$ref": "#/$defs/DataBlock"
-              },
-              {
-                "$ref": "#/$defs/IfBlock"
-              },
-              {
-                "$ref": "#/$defs/MatchBlock"
-              },
-              {
-                "$ref": "#/$defs/RepeatBlock"
-              },
-              {
-                "$ref": "#/$defs/TextBlock"
-              },
-              {
-                "$ref": "#/$defs/LastOfBlock"
-              },
-              {
-                "$ref": "#/$defs/ArrayBlock"
-              },
-              {
-                "$ref": "#/$defs/ObjectBlock"
-              },
-              {
-                "$ref": "#/$defs/MessageBlock"
-              },
-              {
-                "$ref": "#/$defs/ReadBlock"
-              },
-              {
-                "$ref": "#/$defs/IncludeBlock"
-              },
-              {
-                "$ref": "#/$defs/ImportBlock"
-              },
-              {
-                "$ref": "#/$defs/ErrorBlock"
-              },
-              {
-                "$ref": "#/$defs/EmptyBlock"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "default": {},
-          "description": "Set of definitions executed before the execution of the block.\n    ",
-          "title": "Defs",
-          "type": "object"
-        },
-        "def": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Name of the variable used to store the result of the execution of the block.\n    ",
-          "title": "Def"
-        },
-        "contribute": {
-          "default": [
-            "result",
-            "context"
-          ],
-          "description": "Indicate if the block contributes to the result and background context.\n    ",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/$defs/ContributeTarget"
-              },
-              {
-                "additionalProperties": {
-                  "$ref": "#/$defs/ContributeValue"
-                },
-                "type": "object"
-              }
-            ]
-          },
-          "title": "Contribute",
-          "type": "array"
-        },
-        "parser": {
-          "anyOf": [
-            {
-              "enum": [
-                "json",
-                "jsonl",
-                "yaml"
-              ],
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/PdlParser"
-            },
-            {
-              "$ref": "#/$defs/RegexParser"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Parser to use to construct a value out of a string result.",
-          "title": "Parser"
+          "description": "Name of the model following the LiteLLM convention.\n    ",
+          "title": "Model"
         },
-        "fallback": {
+        "input": {
           "anyOf": [
             {
               "type": "boolean"
@@ -6434,7 +6288,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -6488,11 +6345,11 @@
               "type": "null"
             }
           ],
-          "default": null,
-          "description": "Block to execute in case of error.\n    ",
-          "title": "Fallback"
+          "default": "${ pdl_context }",
+          "description": "Messages to send to the model.\n    ",
+          "title": "Input"
         },
-        "role": {
+        "modelResponse": {
           "anyOf": [
             {
               "type": "string"
@@ -6502,10 +6359,22 @@
             }
           ],
           "default": null,
-          "description": "Role associated to the block and sub-blocks.\nTypical roles are `system`, `user`, and `assistant`,\nbut there may be other roles such as `available_tools`.",
-          "title": "Role"
+          "description": "Variable where to store the raw response of the model.\n    ",
+          "title": "Modelresponse"
         },
-        "context": {
+        "pdl__usage": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/PdlUsage"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Tokens consumed during model call\n    "
+        },
+        "pdl__model_input": {
           "anyOf": [
             {
               "items": {
@@ -6517,12 +6386,27 @@
               "type": "null"
             }
           ],
-          "default": [],
-          "description": "Current context\n    ",
-          "title": "Context"
+          "default": null,
+          "title": "Pdl  Model Input"
         },
-        "pdl__id": {
+        "platform": {
+          "const": "litellm",
+          "default": "litellm",
+          "description": "Optional field to ensure that the block is using LiteLLM.\n    ",
+          "title": "Platform",
+          "type": "string"
+        },
+        "parameters": {
           "anyOf": [
+            {
+              "$ref": "#/$defs/LitellmParameters"
+            },
+            {
+              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
+            },
+            {
+              "type": "object"
+            },
             {
               "type": "string"
             },
@@ -6530,269 +6414,58 @@
               "type": "null"
             }
           ],
-          "default": "",
-          "description": "Unique identifier for this block\n    ",
-          "title": "Pdl  Id"
-        },
-        "pdl__result": {
+          "default": null,
+          "description": "Parameters to send to the model.\n    ",
+          "title": "Parameters"
+        }
+      },
+      "required": [
+        "model"
+      ],
+      "title": "LitellmModelBlock",
+      "type": "object"
+    },
+    "LitellmParameters": {
+      "additionalProperties": true,
+      "description": "Parameters passed to LiteLLM. More details at [https://docs.litellm.ai/docs/completion/input](https://docs.litellm.ai/docs/completion/input).\n\nNote that not all models and platforms accept all parameters.",
+      "properties": {
+        "timeout": {
           "anyOf": [
-            {},
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
             {
               "type": "null"
             }
           ],
           "default": null,
-          "description": "Result of the execution of the block",
-          "title": "Pdl  Result"
+          "title": "Timeout"
         },
-        "pdl__location": {
+        "temperature": {
           "anyOf": [
             {
-              "$ref": "#/$defs/PdlLocationType"
+              "type": "number"
+            },
+            {
+              "type": "string"
             },
             {
               "type": "null"
             }
           ],
-          "default": null
+          "default": null,
+          "title": "Temperature"
         },
-        "pdl__timing": {
+        "top_p": {
           "anyOf": [
             {
-              "$ref": "#/$defs/PdlTiming"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null
-        },
-        "pdl__is_leaf": {
-          "const": true,
-          "default": true,
-          "title": "Pdl  Is Leaf",
-          "type": "boolean"
-        },
-        "kind": {
-          "const": "model",
-          "default": "model",
-          "title": "Kind",
-          "type": "string"
-        },
-        "model": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
-            },
-            {
-              "type": "string"
-            }
-          ],
-          "description": "Name of the model following the LiteLLM convention.\n    ",
-          "title": "Model"
-        },
-        "input": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/$defs/FunctionBlock"
-            },
-            {
-              "$ref": "#/$defs/CallBlock"
-            },
-            {
-              "$ref": "#/$defs/LitellmModelBlock"
-            },
-            {
-              "$ref": "#/$defs/GraniteioModelBlock"
-            },
-            {
-              "$ref": "#/$defs/CodeBlock"
-            },
-            {
-              "$ref": "#/$defs/ArgsBlock"
-            },
-            {
-              "$ref": "#/$defs/GetBlock"
-            },
-            {
-              "$ref": "#/$defs/DataBlock"
-            },
-            {
-              "$ref": "#/$defs/IfBlock"
-            },
-            {
-              "$ref": "#/$defs/MatchBlock"
-            },
-            {
-              "$ref": "#/$defs/RepeatBlock"
-            },
-            {
-              "$ref": "#/$defs/TextBlock"
-            },
-            {
-              "$ref": "#/$defs/LastOfBlock"
-            },
-            {
-              "$ref": "#/$defs/ArrayBlock"
-            },
-            {
-              "$ref": "#/$defs/ObjectBlock"
-            },
-            {
-              "$ref": "#/$defs/MessageBlock"
-            },
-            {
-              "$ref": "#/$defs/ReadBlock"
-            },
-            {
-              "$ref": "#/$defs/IncludeBlock"
-            },
-            {
-              "$ref": "#/$defs/ImportBlock"
-            },
-            {
-              "$ref": "#/$defs/ErrorBlock"
-            },
-            {
-              "$ref": "#/$defs/EmptyBlock"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": "${ pdl_context }",
-          "description": "Messages to send to the model.\n    ",
-          "title": "Input"
-        },
-        "modelResponse": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Variable where to store the raw response of the model.\n    ",
-          "title": "Modelresponse"
-        },
-        "pdl__usage": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/PdlUsage"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Tokens consumed during model call\n    "
-        },
-        "pdl__model_input": {
-          "anyOf": [
-            {
-              "items": {
-                "type": "object"
-              },
-              "type": "array"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Pdl  Model Input"
-        },
-        "platform": {
-          "const": "litellm",
-          "default": "litellm",
-          "description": "Optional field to ensure that the block is using LiteLLM.\n    ",
-          "title": "Platform",
-          "type": "string"
-        },
-        "parameters": {
-          "anyOf": [
-            {
-              "$ref": "#/$defs/LitellmParameters"
-            },
-            {
-              "$ref": "#/$defs/LocalizedExpression_TypeVar_"
-            },
-            {
-              "type": "object"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Parameters to send to the model.\n    ",
-          "title": "Parameters"
-        }
-      },
-      "required": [
-        "model"
-      ],
-      "title": "LitellmModelBlock",
-      "type": "object"
-    },
-    "LitellmParameters": {
-      "additionalProperties": true,
-      "description": "Parameters passed to LiteLLM. More details at [https://docs.litellm.ai/docs/completion/input](https://docs.litellm.ai/docs/completion/input).\n\nNote that not all models and platforms accept all parameters.",
-      "properties": {
-        "timeout": {
-          "anyOf": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Timeout"
-        },
-        "temperature": {
-          "anyOf": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "title": "Temperature"
-        },
-        "top_p": {
-          "anyOf": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "string"
+              "type": "number"
+            },
+            {
+              "type": "string"
             },
             {
               "type": "null"
@@ -7234,7 +6907,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -7380,7 +7056,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -7636,7 +7315,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -7785,7 +7467,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -7931,7 +7616,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -8102,7 +7790,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -8199,9 +7890,9 @@
       "title": "MessageBlock",
       "type": "object"
     },
-    "ObjectBlock": {
+    "NonPythonCodeBlock": {
       "additionalProperties": false,
-      "description": "Return the object where the value of each field is defined by a block. If the body of the object is an array, the resulting object is the union of the objects computed by each element of the array.",
+      "description": "Execute a piece of code.\n\nExample:\n```PDL\n- def: N\n  lang: command\n  code: echo hi\n```",
       "properties": {
         "description": {
           "anyOf": [
@@ -8249,7 +7940,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -8395,7 +8089,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -8529,260 +8226,1443 @@
           "default": null
         },
         "pdl__is_leaf": {
-          "const": false,
-          "default": false,
+          "const": true,
+          "default": true,
           "title": "Pdl  Is Leaf",
           "type": "boolean"
         },
         "kind": {
-          "const": "object",
-          "default": "object",
+          "const": "code",
+          "default": "code",
           "title": "Kind",
           "type": "string"
         },
-        "object": {
+        "code": {
           "anyOf": [
             {
-              "additionalProperties": {
-                "anyOf": [
-                  {
-                    "type": "boolean"
-                  },
-                  {
-                    "type": "integer"
-                  },
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "$ref": "#/$defs/FunctionBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/CallBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/LitellmModelBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/GraniteioModelBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/CodeBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ArgsBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/GetBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/DataBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/IfBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/MatchBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/RepeatBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/TextBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/LastOfBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ArrayBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ObjectBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/MessageBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ReadBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/IncludeBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ImportBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ErrorBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/EmptyBlock"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "type": "object"
+              "type": "boolean"
             },
             {
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "boolean"
-                  },
-                  {
-                    "type": "integer"
-                  },
-                  {
-                    "type": "number"
-                  },
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "$ref": "#/$defs/FunctionBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/CallBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/LitellmModelBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/GraniteioModelBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/CodeBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ArgsBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/GetBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/DataBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/IfBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/MatchBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/RepeatBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/TextBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/LastOfBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ArrayBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ObjectBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/MessageBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ReadBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/IncludeBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ImportBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/ErrorBlock"
-                  },
-                  {
-                    "$ref": "#/$defs/EmptyBlock"
-                  },
-                  {
-                    "type": "null"
-                  }
-                ]
-              },
-              "type": "array"
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
+            },
+            {
+              "type": "null"
             }
           ],
-          "title": "Object"
+          "description": "Code to execute.\n    ",
+          "title": "Code"
+        },
+        "lang": {
+          "description": "Programming language of the code.\n    ",
+          "enum": [
+            "command",
+            "jinja",
+            "pdl"
+          ],
+          "title": "Lang",
+          "type": "string"
         }
       },
       "required": [
-        "object"
+        "code",
+        "lang"
       ],
-      "title": "ObjectBlock",
+      "title": "NonPythonCodeBlock",
       "type": "object"
     },
-    "ObjectPattern": {
+    "ObjectBlock": {
       "additionalProperties": false,
+      "description": "Return the object where the value of each field is defined by a block. If the body of the object is an array, the resulting object is the union of the objects computed by each element of the array.",
       "properties": {
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Documentation associated to the block.\n    ",
+          "title": "Description"
+        },
+        "spec": {
+          "default": null,
+          "description": "Type specification of the result of the block.\n    ",
+          "title": "Spec"
+        },
+        "defs": {
+          "additionalProperties": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "integer"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/$defs/FunctionBlock"
+              },
+              {
+                "$ref": "#/$defs/CallBlock"
+              },
+              {
+                "$ref": "#/$defs/LitellmModelBlock"
+              },
+              {
+                "$ref": "#/$defs/GraniteioModelBlock"
+              },
+              {
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/ArgsBlock"
+              },
+              {
+                "$ref": "#/$defs/GetBlock"
+              },
+              {
+                "$ref": "#/$defs/DataBlock"
+              },
+              {
+                "$ref": "#/$defs/IfBlock"
+              },
+              {
+                "$ref": "#/$defs/MatchBlock"
+              },
+              {
+                "$ref": "#/$defs/RepeatBlock"
+              },
+              {
+                "$ref": "#/$defs/TextBlock"
+              },
+              {
+                "$ref": "#/$defs/LastOfBlock"
+              },
+              {
+                "$ref": "#/$defs/ArrayBlock"
+              },
+              {
+                "$ref": "#/$defs/ObjectBlock"
+              },
+              {
+                "$ref": "#/$defs/MessageBlock"
+              },
+              {
+                "$ref": "#/$defs/ReadBlock"
+              },
+              {
+                "$ref": "#/$defs/IncludeBlock"
+              },
+              {
+                "$ref": "#/$defs/ImportBlock"
+              },
+              {
+                "$ref": "#/$defs/ErrorBlock"
+              },
+              {
+                "$ref": "#/$defs/EmptyBlock"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "default": {},
+          "description": "Set of definitions executed before the execution of the block.\n    ",
+          "title": "Defs",
+          "type": "object"
+        },
         "def": {
           "anyOf": [
             {
-              "type": "string"
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Name of the variable used to store the result of the execution of the block.\n    ",
+          "title": "Def"
+        },
+        "contribute": {
+          "default": [
+            "result",
+            "context"
+          ],
+          "description": "Indicate if the block contributes to the result and background context.\n    ",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/$defs/ContributeTarget"
+              },
+              {
+                "additionalProperties": {
+                  "$ref": "#/$defs/ContributeValue"
+                },
+                "type": "object"
+              }
+            ]
+          },
+          "title": "Contribute",
+          "type": "array"
+        },
+        "parser": {
+          "anyOf": [
+            {
+              "enum": [
+                "json",
+                "jsonl",
+                "yaml"
+              ],
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/PdlParser"
+            },
+            {
+              "$ref": "#/$defs/RegexParser"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Parser to use to construct a value out of a string result.",
+          "title": "Parser"
+        },
+        "fallback": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Block to execute in case of error.\n    ",
+          "title": "Fallback"
+        },
+        "role": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Role associated to the block and sub-blocks.\nTypical roles are `system`, `user`, and `assistant`,\nbut there may be other roles such as `available_tools`.",
+          "title": "Role"
+        },
+        "context": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "object"
+              },
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": [],
+          "description": "Current context\n    ",
+          "title": "Context"
+        },
+        "pdl__id": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "",
+          "description": "Unique identifier for this block\n    ",
+          "title": "Pdl  Id"
+        },
+        "pdl__result": {
+          "anyOf": [
+            {},
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Result of the execution of the block",
+          "title": "Pdl  Result"
+        },
+        "pdl__location": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/PdlLocationType"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "pdl__timing": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/PdlTiming"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "pdl__is_leaf": {
+          "const": false,
+          "default": false,
+          "title": "Pdl  Is Leaf",
+          "type": "boolean"
+        },
+        "kind": {
+          "const": "object",
+          "default": "object",
+          "title": "Kind",
+          "type": "string"
+        },
+        "object": {
+          "anyOf": [
+            {
+              "additionalProperties": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "$ref": "#/$defs/FunctionBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/CallBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/LitellmModelBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/GraniteioModelBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/PythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/NonPythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ArgsBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/GetBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/DataBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/IfBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/MatchBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/RepeatBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/TextBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/LastOfBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ArrayBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ObjectBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/MessageBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ReadBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/IncludeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ImportBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ErrorBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/EmptyBlock"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "object"
+            },
+            {
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "number"
+                  },
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "$ref": "#/$defs/FunctionBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/CallBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/LitellmModelBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/GraniteioModelBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/PythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/NonPythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ArgsBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/GetBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/DataBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/IfBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/MatchBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/RepeatBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/TextBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/LastOfBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ArrayBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ObjectBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/MessageBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ReadBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/IncludeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ImportBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/ErrorBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/EmptyBlock"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "type": "array"
+            }
+          ],
+          "title": "Object"
+        }
+      },
+      "required": [
+        "object"
+      ],
+      "title": "ObjectBlock",
+      "type": "object"
+    },
+    "ObjectPattern": {
+      "additionalProperties": false,
+      "properties": {
+        "def": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Def"
+        },
+        "object": {
+          "additionalProperties": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "integer"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/$defs/OrPattern"
+              },
+              {
+                "$ref": "#/$defs/ArrayPattern"
+              },
+              {
+                "$ref": "#/$defs/ObjectPattern"
+              },
+              {
+                "$ref": "#/$defs/AnyPattern"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "title": "Object",
+          "type": "object"
+        }
+      },
+      "required": [
+        "object"
+      ],
+      "title": "ObjectPattern",
+      "type": "object"
+    },
+    "OrPattern": {
+      "additionalProperties": false,
+      "properties": {
+        "def": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Def"
+        },
+        "anyOf": {
+          "items": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "integer"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/$defs/OrPattern"
+              },
+              {
+                "$ref": "#/$defs/ArrayPattern"
+              },
+              {
+                "$ref": "#/$defs/ObjectPattern"
+              },
+              {
+                "$ref": "#/$defs/AnyPattern"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "title": "Anyof",
+          "type": "array"
+        }
+      },
+      "required": [
+        "anyOf"
+      ],
+      "title": "OrPattern",
+      "type": "object"
+    },
+    "PdlBlock": {
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "integer"
+        },
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "$ref": "#/$defs/FunctionBlock"
+        },
+        {
+          "$ref": "#/$defs/CallBlock"
+        },
+        {
+          "$ref": "#/$defs/LitellmModelBlock"
+        },
+        {
+          "$ref": "#/$defs/GraniteioModelBlock"
+        },
+        {
+          "$ref": "#/$defs/PythonCodeBlock"
+        },
+        {
+          "$ref": "#/$defs/NonPythonCodeBlock"
+        },
+        {
+          "$ref": "#/$defs/ArgsBlock"
+        },
+        {
+          "$ref": "#/$defs/GetBlock"
+        },
+        {
+          "$ref": "#/$defs/DataBlock"
+        },
+        {
+          "$ref": "#/$defs/IfBlock"
+        },
+        {
+          "$ref": "#/$defs/MatchBlock"
+        },
+        {
+          "$ref": "#/$defs/RepeatBlock"
+        },
+        {
+          "$ref": "#/$defs/TextBlock"
+        },
+        {
+          "$ref": "#/$defs/LastOfBlock"
+        },
+        {
+          "$ref": "#/$defs/ArrayBlock"
+        },
+        {
+          "$ref": "#/$defs/ObjectBlock"
+        },
+        {
+          "$ref": "#/$defs/MessageBlock"
+        },
+        {
+          "$ref": "#/$defs/ReadBlock"
+        },
+        {
+          "$ref": "#/$defs/IncludeBlock"
+        },
+        {
+          "$ref": "#/$defs/ImportBlock"
+        },
+        {
+          "$ref": "#/$defs/ErrorBlock"
+        },
+        {
+          "$ref": "#/$defs/EmptyBlock"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "title": "PdlBlock"
+    },
+    "PdlLocationType": {
+      "additionalProperties": false,
+      "description": "Internal data structure to keep track of the source location information.",
+      "properties": {
+        "path": {
+          "items": {
+            "type": "string"
+          },
+          "title": "Path",
+          "type": "array"
+        },
+        "file": {
+          "title": "File",
+          "type": "string"
+        },
+        "table": {
+          "additionalProperties": {
+            "type": "integer"
+          },
+          "title": "Table",
+          "type": "object"
+        }
+      },
+      "required": [
+        "path",
+        "file",
+        "table"
+      ],
+      "title": "PdlLocationType",
+      "type": "object"
+    },
+    "PdlParser": {
+      "additionalProperties": false,
+      "properties": {
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Description"
+        },
+        "spec": {
+          "anyOf": [
+            {
+              "type": "object"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "title": "Spec"
+        },
+        "pdl": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "title": "Pdl"
+        }
+      },
+      "required": [
+        "pdl"
+      ],
+      "title": "PdlParser",
+      "type": "object"
+    },
+    "PdlTiming": {
+      "additionalProperties": false,
+      "description": "Internal data structure to record timing information in the trace.",
+      "properties": {
+        "start_nanos": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": 0,
+          "title": "Start Nanos"
+        },
+        "end_nanos": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": 0,
+          "title": "End Nanos"
+        },
+        "first_use_nanos": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": 0,
+          "title": "First Use Nanos"
+        },
+        "timezone": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "",
+          "title": "Timezone"
+        }
+      },
+      "title": "PdlTiming",
+      "type": "object"
+    },
+    "PdlUsage": {
+      "description": "Internal data structure to record token consumption usage information.",
+      "properties": {
+        "completion_tokens": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": 0,
+          "title": "Completion Tokens"
+        },
+        "prompt_tokens": {
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": 0,
+          "title": "Prompt Tokens"
+        }
+      },
+      "title": "PdlUsage",
+      "type": "object"
+    },
+    "Program": {
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "integer"
+        },
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "$ref": "#/$defs/FunctionBlock"
+        },
+        {
+          "$ref": "#/$defs/CallBlock"
+        },
+        {
+          "$ref": "#/$defs/LitellmModelBlock"
+        },
+        {
+          "$ref": "#/$defs/GraniteioModelBlock"
+        },
+        {
+          "$ref": "#/$defs/PythonCodeBlock"
+        },
+        {
+          "$ref": "#/$defs/NonPythonCodeBlock"
+        },
+        {
+          "$ref": "#/$defs/ArgsBlock"
+        },
+        {
+          "$ref": "#/$defs/GetBlock"
+        },
+        {
+          "$ref": "#/$defs/DataBlock"
+        },
+        {
+          "$ref": "#/$defs/IfBlock"
+        },
+        {
+          "$ref": "#/$defs/MatchBlock"
+        },
+        {
+          "$ref": "#/$defs/RepeatBlock"
+        },
+        {
+          "$ref": "#/$defs/TextBlock"
+        },
+        {
+          "$ref": "#/$defs/LastOfBlock"
+        },
+        {
+          "$ref": "#/$defs/ArrayBlock"
+        },
+        {
+          "$ref": "#/$defs/ObjectBlock"
+        },
+        {
+          "$ref": "#/$defs/MessageBlock"
+        },
+        {
+          "$ref": "#/$defs/ReadBlock"
+        },
+        {
+          "$ref": "#/$defs/IncludeBlock"
+        },
+        {
+          "$ref": "#/$defs/ImportBlock"
+        },
+        {
+          "$ref": "#/$defs/ErrorBlock"
+        },
+        {
+          "$ref": "#/$defs/EmptyBlock"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Prompt Declaration Language program (PDL)",
+      "title": "Program"
+    },
+    "PythonCodeBlock": {
+      "additionalProperties": false,
+      "description": "Execute a piece of Python code.\n\nExample:\n```PDL\n- def: N\n  lang: python\n  code: |\n    import random\n    # (In PDL, set `result` to the output you wish for your code block.)\n    result = random.randint(1, 20)\n```",
+      "properties": {
+        "description": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Documentation associated to the block.\n    ",
+          "title": "Description"
+        },
+        "spec": {
+          "default": null,
+          "description": "Type specification of the result of the block.\n    ",
+          "title": "Spec"
+        },
+        "defs": {
+          "additionalProperties": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "integer"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/$defs/FunctionBlock"
+              },
+              {
+                "$ref": "#/$defs/CallBlock"
+              },
+              {
+                "$ref": "#/$defs/LitellmModelBlock"
+              },
+              {
+                "$ref": "#/$defs/GraniteioModelBlock"
+              },
+              {
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/ArgsBlock"
+              },
+              {
+                "$ref": "#/$defs/GetBlock"
+              },
+              {
+                "$ref": "#/$defs/DataBlock"
+              },
+              {
+                "$ref": "#/$defs/IfBlock"
+              },
+              {
+                "$ref": "#/$defs/MatchBlock"
+              },
+              {
+                "$ref": "#/$defs/RepeatBlock"
+              },
+              {
+                "$ref": "#/$defs/TextBlock"
+              },
+              {
+                "$ref": "#/$defs/LastOfBlock"
+              },
+              {
+                "$ref": "#/$defs/ArrayBlock"
+              },
+              {
+                "$ref": "#/$defs/ObjectBlock"
+              },
+              {
+                "$ref": "#/$defs/MessageBlock"
+              },
+              {
+                "$ref": "#/$defs/ReadBlock"
+              },
+              {
+                "$ref": "#/$defs/IncludeBlock"
+              },
+              {
+                "$ref": "#/$defs/ImportBlock"
+              },
+              {
+                "$ref": "#/$defs/ErrorBlock"
+              },
+              {
+                "$ref": "#/$defs/EmptyBlock"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "default": {},
+          "description": "Set of definitions executed before the execution of the block.\n    ",
+          "title": "Defs",
+          "type": "object"
+        },
+        "def": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Name of the variable used to store the result of the execution of the block.\n    ",
+          "title": "Def"
+        },
+        "contribute": {
+          "default": [
+            "result",
+            "context"
+          ],
+          "description": "Indicate if the block contributes to the result and background context.\n    ",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/$defs/ContributeTarget"
+              },
+              {
+                "additionalProperties": {
+                  "$ref": "#/$defs/ContributeValue"
+                },
+                "type": "object"
+              }
+            ]
+          },
+          "title": "Contribute",
+          "type": "array"
+        },
+        "parser": {
+          "anyOf": [
+            {
+              "enum": [
+                "json",
+                "jsonl",
+                "yaml"
+              ],
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/PdlParser"
+            },
+            {
+              "$ref": "#/$defs/RegexParser"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null,
+          "description": "Parser to use to construct a value out of a string result.",
+          "title": "Parser"
+        },
+        "fallback": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/FunctionBlock"
+            },
+            {
+              "$ref": "#/$defs/CallBlock"
+            },
+            {
+              "$ref": "#/$defs/LitellmModelBlock"
+            },
+            {
+              "$ref": "#/$defs/GraniteioModelBlock"
+            },
+            {
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/ArgsBlock"
+            },
+            {
+              "$ref": "#/$defs/GetBlock"
+            },
+            {
+              "$ref": "#/$defs/DataBlock"
+            },
+            {
+              "$ref": "#/$defs/IfBlock"
+            },
+            {
+              "$ref": "#/$defs/MatchBlock"
+            },
+            {
+              "$ref": "#/$defs/RepeatBlock"
+            },
+            {
+              "$ref": "#/$defs/TextBlock"
+            },
+            {
+              "$ref": "#/$defs/LastOfBlock"
+            },
+            {
+              "$ref": "#/$defs/ArrayBlock"
+            },
+            {
+              "$ref": "#/$defs/ObjectBlock"
+            },
+            {
+              "$ref": "#/$defs/MessageBlock"
+            },
+            {
+              "$ref": "#/$defs/ReadBlock"
+            },
+            {
+              "$ref": "#/$defs/IncludeBlock"
+            },
+            {
+              "$ref": "#/$defs/ImportBlock"
+            },
+            {
+              "$ref": "#/$defs/ErrorBlock"
+            },
+            {
+              "$ref": "#/$defs/EmptyBlock"
             },
             {
               "type": "null"
             }
           ],
           "default": null,
-          "title": "Def"
+          "description": "Block to execute in case of error.\n    ",
+          "title": "Fallback"
         },
-        "object": {
-          "additionalProperties": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "integer"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/$defs/OrPattern"
-              },
-              {
-                "$ref": "#/$defs/ArrayPattern"
-              },
-              {
-                "$ref": "#/$defs/ObjectPattern"
-              },
-              {
-                "$ref": "#/$defs/AnyPattern"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "title": "Object",
-          "type": "object"
-        }
-      },
-      "required": [
-        "object"
-      ],
-      "title": "ObjectPattern",
-      "type": "object"
-    },
-    "OrPattern": {
-      "additionalProperties": false,
-      "properties": {
-        "def": {
+        "role": {
           "anyOf": [
             {
               "type": "string"
@@ -8792,168 +9672,26 @@
             }
           ],
           "default": null,
-          "title": "Def"
+          "description": "Role associated to the block and sub-blocks.\nTypical roles are `system`, `user`, and `assistant`,\nbut there may be other roles such as `available_tools`.",
+          "title": "Role"
         },
-        "anyOf": {
-          "items": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "integer"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/$defs/OrPattern"
-              },
-              {
-                "$ref": "#/$defs/ArrayPattern"
-              },
-              {
-                "$ref": "#/$defs/ObjectPattern"
-              },
-              {
-                "$ref": "#/$defs/AnyPattern"
+        "context": {
+          "anyOf": [
+            {
+              "items": {
+                "type": "object"
               },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "title": "Anyof",
-          "type": "array"
-        }
-      },
-      "required": [
-        "anyOf"
-      ],
-      "title": "OrPattern",
-      "type": "object"
-    },
-    "PdlBlock": {
-      "anyOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "integer"
-        },
-        {
-          "type": "number"
-        },
-        {
-          "type": "string"
-        },
-        {
-          "$ref": "#/$defs/FunctionBlock"
-        },
-        {
-          "$ref": "#/$defs/CallBlock"
-        },
-        {
-          "$ref": "#/$defs/LitellmModelBlock"
-        },
-        {
-          "$ref": "#/$defs/GraniteioModelBlock"
-        },
-        {
-          "$ref": "#/$defs/CodeBlock"
-        },
-        {
-          "$ref": "#/$defs/ArgsBlock"
-        },
-        {
-          "$ref": "#/$defs/GetBlock"
-        },
-        {
-          "$ref": "#/$defs/DataBlock"
-        },
-        {
-          "$ref": "#/$defs/IfBlock"
-        },
-        {
-          "$ref": "#/$defs/MatchBlock"
-        },
-        {
-          "$ref": "#/$defs/RepeatBlock"
-        },
-        {
-          "$ref": "#/$defs/TextBlock"
-        },
-        {
-          "$ref": "#/$defs/LastOfBlock"
-        },
-        {
-          "$ref": "#/$defs/ArrayBlock"
-        },
-        {
-          "$ref": "#/$defs/ObjectBlock"
-        },
-        {
-          "$ref": "#/$defs/MessageBlock"
-        },
-        {
-          "$ref": "#/$defs/ReadBlock"
-        },
-        {
-          "$ref": "#/$defs/IncludeBlock"
-        },
-        {
-          "$ref": "#/$defs/ImportBlock"
-        },
-        {
-          "$ref": "#/$defs/ErrorBlock"
-        },
-        {
-          "$ref": "#/$defs/EmptyBlock"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "title": "PdlBlock"
-    },
-    "PdlLocationType": {
-      "additionalProperties": false,
-      "description": "Internal data structure to keep track of the source location information.",
-      "properties": {
-        "path": {
-          "items": {
-            "type": "string"
-          },
-          "title": "Path",
-          "type": "array"
-        },
-        "file": {
-          "title": "File",
-          "type": "string"
-        },
-        "table": {
-          "additionalProperties": {
-            "type": "integer"
-          },
-          "title": "Table",
-          "type": "object"
-        }
-      },
-      "required": [
-        "path",
-        "file",
-        "table"
-      ],
-      "title": "PdlLocationType",
-      "type": "object"
-    },
-    "PdlParser": {
-      "additionalProperties": false,
-      "properties": {
-        "description": {
+              "type": "array"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": [],
+          "description": "Current context\n    ",
+          "title": "Context"
+        },
+        "pdl__id": {
           "anyOf": [
             {
               "type": "string"
@@ -8962,22 +9700,56 @@
               "type": "null"
             }
           ],
+          "default": "",
+          "description": "Unique identifier for this block\n    ",
+          "title": "Pdl  Id"
+        },
+        "pdl__result": {
+          "anyOf": [
+            {},
+            {
+              "type": "null"
+            }
+          ],
           "default": null,
-          "title": "Description"
+          "description": "Result of the execution of the block",
+          "title": "Pdl  Result"
         },
-        "spec": {
+        "pdl__location": {
           "anyOf": [
             {
-              "type": "object"
+              "$ref": "#/$defs/PdlLocationType"
             },
             {
               "type": "null"
             }
           ],
-          "default": null,
-          "title": "Spec"
+          "default": null
         },
-        "pdl": {
+        "pdl__timing": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/PdlTiming"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "pdl__is_leaf": {
+          "const": true,
+          "default": true,
+          "title": "Pdl  Is Leaf",
+          "type": "boolean"
+        },
+        "kind": {
+          "const": "code",
+          "default": "code",
+          "title": "Kind",
+          "type": "string"
+        },
+        "code": {
           "anyOf": [
             {
               "type": "boolean"
@@ -9004,7 +9776,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -9058,185 +9833,41 @@
               "type": "null"
             }
           ],
-          "title": "Pdl"
-        }
-      },
-      "required": [
-        "pdl"
-      ],
-      "title": "PdlParser",
-      "type": "object"
-    },
-    "PdlTiming": {
-      "additionalProperties": false,
-      "description": "Internal data structure to record timing information in the trace.",
-      "properties": {
-        "start_nanos": {
-          "anyOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": 0,
-          "title": "Start Nanos"
-        },
-        "end_nanos": {
-          "anyOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": 0,
-          "title": "End Nanos"
+          "description": "Code to execute.\n    ",
+          "title": "Code"
         },
-        "first_use_nanos": {
-          "anyOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": 0,
-          "title": "First Use Nanos"
+        "lang": {
+          "const": "python",
+          "default": "python",
+          "description": "Programming language of the code.\n    ",
+          "title": "Lang",
+          "type": "string"
         },
-        "timezone": {
+        "requirements": {
           "anyOf": [
             {
               "type": "string"
             },
             {
-              "type": "null"
-            }
-          ],
-          "default": "",
-          "title": "Timezone"
-        }
-      },
-      "title": "PdlTiming",
-      "type": "object"
-    },
-    "PdlUsage": {
-      "description": "Internal data structure to record token consumption usage information.",
-      "properties": {
-        "completion_tokens": {
-          "anyOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": 0,
-          "title": "Completion Tokens"
-        },
-        "prompt_tokens": {
-          "anyOf": [
-            {
-              "type": "integer"
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
             },
             {
               "type": "null"
             }
           ],
-          "default": 0,
-          "title": "Prompt Tokens"
+          "default": null,
+          "description": "Pip requirements.txt\n    ",
+          "title": "Requirements"
         }
       },
-      "title": "PdlUsage",
-      "type": "object"
-    },
-    "Program": {
-      "anyOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "integer"
-        },
-        {
-          "type": "number"
-        },
-        {
-          "type": "string"
-        },
-        {
-          "$ref": "#/$defs/FunctionBlock"
-        },
-        {
-          "$ref": "#/$defs/CallBlock"
-        },
-        {
-          "$ref": "#/$defs/LitellmModelBlock"
-        },
-        {
-          "$ref": "#/$defs/GraniteioModelBlock"
-        },
-        {
-          "$ref": "#/$defs/CodeBlock"
-        },
-        {
-          "$ref": "#/$defs/ArgsBlock"
-        },
-        {
-          "$ref": "#/$defs/GetBlock"
-        },
-        {
-          "$ref": "#/$defs/DataBlock"
-        },
-        {
-          "$ref": "#/$defs/IfBlock"
-        },
-        {
-          "$ref": "#/$defs/MatchBlock"
-        },
-        {
-          "$ref": "#/$defs/RepeatBlock"
-        },
-        {
-          "$ref": "#/$defs/TextBlock"
-        },
-        {
-          "$ref": "#/$defs/LastOfBlock"
-        },
-        {
-          "$ref": "#/$defs/ArrayBlock"
-        },
-        {
-          "$ref": "#/$defs/ObjectBlock"
-        },
-        {
-          "$ref": "#/$defs/MessageBlock"
-        },
-        {
-          "$ref": "#/$defs/ReadBlock"
-        },
-        {
-          "$ref": "#/$defs/IncludeBlock"
-        },
-        {
-          "$ref": "#/$defs/ImportBlock"
-        },
-        {
-          "$ref": "#/$defs/ErrorBlock"
-        },
-        {
-          "$ref": "#/$defs/EmptyBlock"
-        },
-        {
-          "type": "null"
-        }
+      "required": [
+        "code"
       ],
-      "description": "Prompt Declaration Language program (PDL)",
-      "title": "Program"
+      "title": "PythonCodeBlock",
+      "type": "object"
     },
     "ReadBlock": {
       "additionalProperties": false,
@@ -9288,7 +9919,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -9434,7 +10068,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -9721,7 +10358,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -9867,7 +10507,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -10082,7 +10725,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -10226,7 +10872,10 @@
                     "$ref": "#/$defs/GraniteioModelBlock"
                   },
                   {
-                    "$ref": "#/$defs/CodeBlock"
+                    "$ref": "#/$defs/PythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/NonPythonCodeBlock"
                   },
                   {
                     "$ref": "#/$defs/ArgsBlock"
@@ -10347,7 +10996,10 @@
                 "$ref": "#/$defs/GraniteioModelBlock"
               },
               {
-                "$ref": "#/$defs/CodeBlock"
+                "$ref": "#/$defs/PythonCodeBlock"
+              },
+              {
+                "$ref": "#/$defs/NonPythonCodeBlock"
               },
               {
                 "$ref": "#/$defs/ArgsBlock"
@@ -10493,7 +11145,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -10665,7 +11320,10 @@
               "$ref": "#/$defs/GraniteioModelBlock"
             },
             {
-              "$ref": "#/$defs/CodeBlock"
+              "$ref": "#/$defs/PythonCodeBlock"
+            },
+            {
+              "$ref": "#/$defs/NonPythonCodeBlock"
             },
             {
               "$ref": "#/$defs/ArgsBlock"
@@ -10743,7 +11401,10 @@
                     "$ref": "#/$defs/GraniteioModelBlock"
                   },
                   {
-                    "$ref": "#/$defs/CodeBlock"
+                    "$ref": "#/$defs/PythonCodeBlock"
+                  },
+                  {
+                    "$ref": "#/$defs/NonPythonCodeBlock"
                   },
                   {
                     "$ref": "#/$defs/ArgsBlock"
diff --git a/src/pdl/pdl_ast.py b/src/pdl/pdl_ast.py
index 87bcea30e..c7f30ee36 100644
--- a/src/pdl/pdl_ast.py
+++ b/src/pdl/pdl_ast.py
@@ -474,16 +474,51 @@ class CodeBlock(BaseCodeBlock):
     ```
     """
 
-    lang: Annotated[
-        Literal["python", "command", "jinja", "pdl"], BeforeValidator(_ensure_lower)
-    ]
-    """Programming language of the code.
-    """
     code: "BlockType"
     """Code to execute.
     """
 
 
+class NonPythonCodeBlock(CodeBlock):
+    """
+    Execute a piece of code.
+
+    Example:
+    ```PDL
+    - def: N
+      lang: command
+      code: echo hi
+    ```
+    """
+
+    lang: Annotated[Literal["command", "jinja", "pdl"], BeforeValidator(_ensure_lower)]
+    """Programming language of the code.
+    """
+
+
+class PythonCodeBlock(CodeBlock):
+    """
+    Execute a piece of Python code.
+
+    Example:
+    ```PDL
+    - def: N
+      lang: python
+      code: |
+        import random
+        # (In PDL, set `result` to the output you wish for your code block.)
+        result = random.randint(1, 20)
+    ```
+    """
+
+    lang: Annotated[Literal["python"], BeforeValidator(_ensure_lower)] = "python"
+    """Programming language of the code.
+    """
+    requirements: Optional[str | list[str]] = None
+    """Pip requirements.txt
+    """
+
+
 class ArgsBlock(BaseCodeBlock):
     """
     Execute a command line, which will spawn a subprocess with the given argument vector. Note: if you need a shell script execution, you must wrap your command line in /bin/sh or somne shell of your choosing.
@@ -829,7 +864,8 @@ class EmptyBlock(LeafBlock):
     | CallBlock
     | LitellmModelBlock
     | GraniteioModelBlock
-    | CodeBlock
+    | PythonCodeBlock
+    | NonPythonCodeBlock
     | ArgsBlock
     | GetBlock
     | DataBlock
diff --git a/src/pdl/pdl_dumper.py b/src/pdl/pdl_dumper.py
index e1ab70e4b..c65501e69 100644
--- a/src/pdl/pdl_dumper.py
+++ b/src/pdl/pdl_dumper.py
@@ -12,7 +12,6 @@
     ArrayPattern,
     Block,
     CallBlock,
-    CodeBlock,
     ContributeTarget,
     ContributeValue,
     DataBlock,
@@ -33,6 +32,7 @@
     LocalizedExpression,
     MatchBlock,
     MessageBlock,
+    NonPythonCodeBlock,
     ObjectBlock,
     ObjectPattern,
     OrPattern,
@@ -42,6 +42,7 @@
     PdlParser,
     PdlTiming,
     PdlUsage,
+    PythonCodeBlock,
     ReadBlock,
     RegexParser,
     RepeatBlock,
@@ -144,9 +145,12 @@ def block_to_dict(  # noqa: C901
                 d["pdl__usage"] = usage_to_dict(block.pdl__usage)
         case ArgsBlock():
             d["args"] = block.args
-        case CodeBlock():
+        case PythonCodeBlock() | NonPythonCodeBlock():
             d["lang"] = block.lang
             d["code"] = block_to_dict(block.code, json_compatible)
+            match block:
+                case PythonCodeBlock():
+                    d["requirements"] = block.requirements
         case GetBlock():
             d["get"] = block.get
         case DataBlock():
diff --git a/src/pdl/pdl_interpreter.py b/src/pdl/pdl_interpreter.py
index fc748d5af..d39d935b5 100644
--- a/src/pdl/pdl_interpreter.py
+++ b/src/pdl/pdl_interpreter.py
@@ -43,7 +43,6 @@
     BlockKind,
     BlockType,
     CallBlock,
-    CodeBlock,
     ContributeTarget,
     ContributeValue,
     DataBlock,
@@ -67,6 +66,7 @@
     MessageBlock,
     ModelBlock,
     ModelInput,
+    NonPythonCodeBlock,
     ObjectBlock,
     ObjectPattern,
     OrPattern,
@@ -82,6 +82,7 @@
     PdlTiming,
     PdlUsage,
     Program,
+    PythonCodeBlock,
     ReadBlock,
     RegexParser,
     RepeatBlock,
@@ -457,7 +458,7 @@ def process_block_body(
             result, background, scope, trace = process_call_model(
                 state, scope, block, loc
             )
-        case ArgsBlock() | CodeBlock():
+        case ArgsBlock() | PythonCodeBlock() | NonPythonCodeBlock():
             result, background, scope, trace = process_call_code(
                 state, scope, block, loc
             )
@@ -1505,9 +1506,14 @@ def generate_client_response_single(
 def process_call_code(
     state: InterpreterState,
     scope: ScopeType,
-    block: ArgsBlock | CodeBlock,
+    block: ArgsBlock | PythonCodeBlock | NonPythonCodeBlock,
     loc: PdlLocationType,
-) -> tuple[PdlLazy[Any], LazyMessages, ScopeType, ArgsBlock | CodeBlock]:
+) -> tuple[
+    PdlLazy[Any],
+    LazyMessages,
+    ScopeType,
+    ArgsBlock | PythonCodeBlock | NonPythonCodeBlock,
+]:
     background: LazyMessages
     code_a: None | list[str] = None
     code_s = ""
@@ -1522,7 +1528,8 @@ def process_call_code(
                 code_a.append(arg_i)
                 args_trace.append(trace_i)
             block = block.model_copy(update={"args": args_trace})
-        case CodeBlock():
+            code_a = [process_expr(scope, arg_i, loc) for arg_i in block.args]
+        case PythonCodeBlock() | NonPythonCodeBlock():
             code_, _, _, block = process_block_of(
                 block,
                 "code",
diff --git a/tests/test_errors.py b/tests/test_errors.py
index 7db1d251c..9fe75d2a5 100644
--- a/tests/test_errors.py
+++ b/tests/test_errors.py
@@ -140,7 +140,6 @@ def test_error5():
     error(
         error5,
         [
-            "line 0 - Missing required field: lang",
             "line 0 - Field not allowed: lans",
         ],
     )
diff --git a/tests/test_line_table.py b/tests/test_line_table.py
index e490a53ee..b5fa0f6c6 100644
--- a/tests/test_line_table.py
+++ b/tests/test_line_table.py
@@ -72,7 +72,6 @@ def test_line4(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello7.pdl",
     "errors": [
         "",
-        "tests/data/line/hello7.pdl:4 - Missing required field: lang",
         "tests/data/line/hello7.pdl:4 - Field not allowed: lans",
     ],
 }