feat!: bump openjd crates for EXPR and WRAP_ACTIONS extension support

THIRD-PARTY-LICENSES.txt

@@ -2522,13 +2522,13 @@ limitations under the License.
 ** arraydeque; version 0.5.1 -- https://crates.io/crates/arraydeque
 ** get-size-derive2; version 0.7.4 -- https://crates.io/crates/get-size-derive2
 ** get-size2; version 0.7.4 -- https://crates.io/crates/get-size2
-** granit-parser; version 0.0.2 -- https://crates.io/crates/granit-parser
+** granit-parser; version 0.0.3 -- https://crates.io/crates/granit-parser
 ** itoa; version 1.0.18 -- https://crates.io/crates/itoa
 ** libc; version 0.2.186 -- https://crates.io/crates/libc
 ** manyhow-macros; version 0.11.4 -- https://crates.io/crates/manyhow-macros
 ** openjd-expr; version 0.1.2 -- https://crates.io/crates/openjd-expr
-** openjd-model; version 0.2.1 -- https://crates.io/crates/openjd-model
-** openjd-sessions; version 0.2.3 -- https://crates.io/crates/openjd-sessions
+** openjd-model; version 0.3.0 -- https://crates.io/crates/openjd-model
+** openjd-sessions; version 0.3.1 -- https://crates.io/crates/openjd-sessions
 ** pin-project-lite; version 0.2.17 -- https://crates.io/crates/pin-project-lite
 ** portable-atomic; version 1.13.1 -- https://crates.io/crates/portable-atomic
 ** proc-macro2; version 1.0.106 -- https://crates.io/crates/proc-macro2
@@ -2542,7 +2542,7 @@ limitations under the License.
 ** rustc-hash; version 2.1.2 -- https://crates.io/crates/rustc-hash
 ** rustversion; version 1.0.22 -- https://crates.io/crates/rustversion
 ** ryu; version 1.0.23 -- https://crates.io/crates/ryu
-** serde-saphyr; version 0.0.26 -- https://crates.io/crates/serde-saphyr
+** serde-saphyr; version 0.0.27 -- https://crates.io/crates/serde-saphyr
 ** serde; version 1.0.228 -- https://crates.io/crates/serde
 ** serde_core; version 1.0.228 -- https://crates.io/crates/serde_core
 ** serde_derive; version 1.0.228 -- https://crates.io/crates/serde_derive

rust-bindings/Cargo.toml

@@ -13,8 +13,8 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 openjd-expr = "0.1.2"
-openjd-model = "0.2.1"
-openjd-sessions = "0.2.3"
+openjd-model = "0.3.0"
+openjd-sessions = "0.3.1"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 uuid = { version = "1", features = ["v4"] }
 serde_json = "1"

rust-bindings/src/model/template_types.rs

@@ -325,17 +325,30 @@ impl PyEnvironmentActions {
     /// schema. If both flavours of the same field are passed, the
     /// snake-case form wins.
     #[new]
-    #[pyo3(signature = (*, on_enter=None, on_exit=None, onEnter=None, onExit=None))]
+    #[allow(clippy::too_many_arguments)]
+    #[pyo3(signature = (*, on_enter=None, on_exit=None, on_wrap_env_enter=None, on_wrap_task_run=None, on_wrap_env_exit=None, onEnter=None, onExit=None, onWrapEnvEnter=None, onWrapTaskRun=None, onWrapEnvExit=None))]
     fn new(
         on_enter: Option<PyAction>,
         on_exit: Option<PyAction>,
+        on_wrap_env_enter: Option<PyAction>,
+        on_wrap_task_run: Option<PyAction>,
+        on_wrap_env_exit: Option<PyAction>,
         #[allow(non_snake_case)] onEnter: Option<PyAction>,
         #[allow(non_snake_case)] onExit: Option<PyAction>,
+        #[allow(non_snake_case)] onWrapEnvEnter: Option<PyAction>,
+        #[allow(non_snake_case)] onWrapTaskRun: Option<PyAction>,
+        #[allow(non_snake_case)] onWrapEnvExit: Option<PyAction>,
     ) -> Self {
         let on_enter = on_enter.or(onEnter);
         let on_exit = on_exit.or(onExit);
+        let on_wrap_env_enter = on_wrap_env_enter.or(onWrapEnvEnter);
+        let on_wrap_task_run = on_wrap_task_run.or(onWrapTaskRun);
+        let on_wrap_env_exit = on_wrap_env_exit.or(onWrapEnvExit);
         PyEnvironmentActions {
             inner: EnvironmentActions {
+                on_wrap_env_enter: on_wrap_env_enter.map(|a| a.inner),
+                on_wrap_task_run: on_wrap_task_run.map(|a| a.inner),
+                on_wrap_env_exit: on_wrap_env_exit.map(|a| a.inner),
                 on_enter: on_enter.map(|a| a.inner),
                 on_exit: on_exit.map(|a| a.inner),
             },
@@ -370,6 +383,48 @@ impl PyEnvironmentActions {
         self.on_exit()
     }
 
+    #[getter]
+    fn on_wrap_env_enter(&self) -> Option<PyAction> {
+        self.inner
+            .on_wrap_env_enter
+            .as_ref()
+            .map(|a| PyAction { inner: a.clone() })
+    }
+
+    #[getter]
+    #[pyo3(name = "onWrapEnvEnter")]
+    fn on_wrap_env_enter_camel(&self) -> Option<PyAction> {
+        self.on_wrap_env_enter()
+    }
+
+    #[getter]
+    fn on_wrap_task_run(&self) -> Option<PyAction> {
+        self.inner
+            .on_wrap_task_run
+            .as_ref()
+            .map(|a| PyAction { inner: a.clone() })
+    }
+
+    #[getter]
+    #[pyo3(name = "onWrapTaskRun")]
+    fn on_wrap_task_run_camel(&self) -> Option<PyAction> {
+        self.on_wrap_task_run()
+    }
+
+    #[getter]
+    fn on_wrap_env_exit(&self) -> Option<PyAction> {
+        self.inner
+            .on_wrap_env_exit
+            .as_ref()
+            .map(|a| PyAction { inner: a.clone() })
+    }
+
+    #[getter]
+    #[pyo3(name = "onWrapEnvExit")]
+    fn on_wrap_env_exit_camel(&self) -> Option<PyAction> {
+        self.on_wrap_env_exit()
+    }
+
     fn __repr__(&self) -> String {
         format!(
             "EnvironmentActions(on_enter={}, on_exit={})",
@@ -398,6 +453,15 @@ impl PyEnvironmentActions {
         if let Some(a) = slf.on_exit() {
             kwargs.set_item("on_exit", a)?;
         }
+        if let Some(a) = slf.on_wrap_env_enter() {
+            kwargs.set_item("on_wrap_env_enter", a)?;
+        }
+        if let Some(a) = slf.on_wrap_task_run() {
+            kwargs.set_item("on_wrap_task_run", a)?;
+        }
+        if let Some(a) = slf.on_wrap_env_exit() {
+            kwargs.set_item("on_wrap_env_exit", a)?;
+        }
         let cls = py.get_type::<PyEnvironmentActions>();
         let args = PyTuple::new(py, [cls.into_any(), kwargs.into_any()])?;
         Ok((helper, args.into()))

rust-bindings/src/sessions/session.rs

@@ -539,15 +539,20 @@ impl PySession {
     }
 
     /// Run a task. Non-blocking — spawns the onRun action on a background thread.
-    #[pyo3(signature = (*, step_script, task_parameter_values=None, resolved_symtab=None, os_env_vars=None))]
+    ///
+    /// `step_name` is surfaced as `WrappedStep.Name` to a wrapping environment's
+    /// `onWrapTaskRun` hook (RFC 0008).
+    #[pyo3(signature = (*, step_script, step_name="", task_parameter_values=None, resolved_symtab=None, os_env_vars=None))]
     fn run_task(
         &self,
         step_script: &PyStepScript,
+        step_name: &str,
         task_parameter_values: Option<&Bound<'_, PyDict>>,
         resolved_symtab: Option<&crate::expr::PySerializedSymbolTable>,
         os_env_vars: Option<HashMap<String, String>>,
     ) -> PyResult<()> {
         let script = step_script.inner.clone();
+        let step_name = step_name.to_owned();
         let task_params = match task_parameter_values {
             Some(d) => Some(extract_task_parameter_values(d)?),
             None => None,
@@ -573,8 +578,13 @@ impl PySession {
             run_action(session, session_arc, snapshot, move |rt, session| {
                 let env_ref = os_env_vars.as_ref();
                 let task_ref = task_params.as_ref();
-                let _ =
-                    rt.block_on(session.run_task(&script, task_ref, resolved.as_ref(), env_ref));
+                let _ = rt.block_on(session.run_task(
+                    &step_name,
+                    &script,
+                    task_ref,
+                    resolved.as_ref(),
+                    env_ref,
+                ));
             });
         });