Skip to content

Commit fdd9cd6

Browse files
committed
feat!: update openjd-sessions and openjd-model crates
Signed-off-by: Jericho Tolentino <68654047+jericht@users.noreply.github.com>
1 parent 8eae8ae commit fdd9cd6

4 files changed

Lines changed: 21 additions & 12 deletions

File tree

‎Cargo.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust-bindings/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ crate-type = ["cdylib", "rlib"]
1313

1414
[dependencies]
1515
openjd-expr = "0.1.2"
16-
openjd-model = "0.2.1"
17-
openjd-sessions = "0.2.3"
16+
openjd-model = "0.3.0"
17+
openjd-sessions = "0.3.1"
1818
tokio = { version = "1", features = ["rt-multi-thread"] }
1919
uuid = { version = "1", features = ["v4"] }
2020
serde_json = "1"

‎rust-bindings/src/model/template_types.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@ impl PyEnvironmentActions {
336336
let on_exit = on_exit.or(onExit);
337337
PyEnvironmentActions {
338338
inner: EnvironmentActions {
339+
// Added in openjd-model 0.3.0: wrap action hooks for environments
340+
on_wrap_env_enter: None,
341+
on_wrap_task_run: None,
342+
on_wrap_env_exit: None,
339343
on_enter: on_enter.map(|a| a.inner),
340344
on_exit: on_exit.map(|a| a.inner),
341345
},

‎rust-bindings/src/sessions/session.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,15 +539,20 @@ impl PySession {
539539
}
540540

541541
/// Run a task. Non-blocking — spawns the onRun action on a background thread.
542-
#[pyo3(signature = (*, step_script, task_parameter_values=None, resolved_symtab=None, os_env_vars=None))]
542+
///
543+
/// `step_name` is surfaced as `WrappedStep.Name` to a wrapping environment's
544+
/// `onWrapTaskRun` hook (RFC 0008).
545+
#[pyo3(signature = (*, step_script, step_name="", task_parameter_values=None, resolved_symtab=None, os_env_vars=None))]
543546
fn run_task(
544547
&self,
545548
step_script: &PyStepScript,
549+
step_name: &str,
546550
task_parameter_values: Option<&Bound<'_, PyDict>>,
547551
resolved_symtab: Option<&crate::expr::PySerializedSymbolTable>,
548552
os_env_vars: Option<HashMap<String, String>>,
549553
) -> PyResult<()> {
550554
let script = step_script.inner.clone();
555+
let step_name = step_name.to_owned();
551556
let task_params = match task_parameter_values {
552557
Some(d) => Some(extract_task_parameter_values(d)?),
553558
None => None,
@@ -574,7 +579,7 @@ impl PySession {
574579
let env_ref = os_env_vars.as_ref();
575580
let task_ref = task_params.as_ref();
576581
let _ =
577-
rt.block_on(session.run_task(&script, task_ref, resolved.as_ref(), env_ref));
582+
rt.block_on(session.run_task(&step_name, &script, task_ref, resolved.as_ref(), env_ref));
578583
});
579584
});
580585

0 commit comments

Comments
 (0)