Skip to content

Commit 2521b65

Browse files
committed
feat!: bump openjd crates for EXPR and WRAP_ACTIONS extension support
Signed-off-by: Jericho Tolentino <68654047+jericht@users.noreply.github.com>
1 parent 8eae8ae commit 2521b65

5 files changed

Lines changed: 91 additions & 18 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.

‎THIRD-PARTY-LICENSES.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2522,13 +2522,13 @@ limitations under the License.
25222522
** arraydeque; version 0.5.1 -- https://crates.io/crates/arraydeque
25232523
** get-size-derive2; version 0.7.4 -- https://crates.io/crates/get-size-derive2
25242524
** get-size2; version 0.7.4 -- https://crates.io/crates/get-size2
2525-
** granit-parser; version 0.0.2 -- https://crates.io/crates/granit-parser
2525+
** granit-parser; version 0.0.3 -- https://crates.io/crates/granit-parser
25262526
** itoa; version 1.0.18 -- https://crates.io/crates/itoa
25272527
** libc; version 0.2.186 -- https://crates.io/crates/libc
25282528
** manyhow-macros; version 0.11.4 -- https://crates.io/crates/manyhow-macros
25292529
** openjd-expr; version 0.1.2 -- https://crates.io/crates/openjd-expr
2530-
** openjd-model; version 0.2.1 -- https://crates.io/crates/openjd-model
2531-
** openjd-sessions; version 0.2.3 -- https://crates.io/crates/openjd-sessions
2530+
** openjd-model; version 0.3.0 -- https://crates.io/crates/openjd-model
2531+
** openjd-sessions; version 0.3.1 -- https://crates.io/crates/openjd-sessions
25322532
** pin-project-lite; version 0.2.17 -- https://crates.io/crates/pin-project-lite
25332533
** portable-atomic; version 1.13.1 -- https://crates.io/crates/portable-atomic
25342534
** proc-macro2; version 1.0.106 -- https://crates.io/crates/proc-macro2
@@ -2542,7 +2542,7 @@ limitations under the License.
25422542
** rustc-hash; version 2.1.2 -- https://crates.io/crates/rustc-hash
25432543
** rustversion; version 1.0.22 -- https://crates.io/crates/rustversion
25442544
** ryu; version 1.0.23 -- https://crates.io/crates/ryu
2545-
** serde-saphyr; version 0.0.26 -- https://crates.io/crates/serde-saphyr
2545+
** serde-saphyr; version 0.0.27 -- https://crates.io/crates/serde-saphyr
25462546
** serde; version 1.0.228 -- https://crates.io/crates/serde
25472547
** serde_core; version 1.0.228 -- https://crates.io/crates/serde_core
25482548
** serde_derive; version 1.0.228 -- https://crates.io/crates/serde_derive

‎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: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,29 @@ impl PyEnvironmentActions {
325325
/// schema. If both flavours of the same field are passed, the
326326
/// snake-case form wins.
327327
#[new]
328-
#[pyo3(signature = (*, on_enter=None, on_exit=None, onEnter=None, onExit=None))]
328+
#[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))]
329329
fn new(
330330
on_enter: Option<PyAction>,
331331
on_exit: Option<PyAction>,
332+
on_wrap_env_enter: Option<PyAction>,
333+
on_wrap_task_run: Option<PyAction>,
334+
on_wrap_env_exit: Option<PyAction>,
332335
#[allow(non_snake_case)] onEnter: Option<PyAction>,
333336
#[allow(non_snake_case)] onExit: Option<PyAction>,
337+
#[allow(non_snake_case)] onWrapEnvEnter: Option<PyAction>,
338+
#[allow(non_snake_case)] onWrapTaskRun: Option<PyAction>,
339+
#[allow(non_snake_case)] onWrapEnvExit: Option<PyAction>,
334340
) -> Self {
335341
let on_enter = on_enter.or(onEnter);
336342
let on_exit = on_exit.or(onExit);
343+
let on_wrap_env_enter = on_wrap_env_enter.or(onWrapEnvEnter);
344+
let on_wrap_task_run = on_wrap_task_run.or(onWrapTaskRun);
345+
let on_wrap_env_exit = on_wrap_env_exit.or(onWrapEnvExit);
337346
PyEnvironmentActions {
338347
inner: EnvironmentActions {
348+
on_wrap_env_enter: on_wrap_env_enter.map(|a| a.inner),
349+
on_wrap_task_run: on_wrap_task_run.map(|a| a.inner),
350+
on_wrap_env_exit: on_wrap_env_exit.map(|a| a.inner),
339351
on_enter: on_enter.map(|a| a.inner),
340352
on_exit: on_exit.map(|a| a.inner),
341353
},
@@ -370,6 +382,48 @@ impl PyEnvironmentActions {
370382
self.on_exit()
371383
}
372384

385+
#[getter]
386+
fn on_wrap_env_enter(&self) -> Option<PyAction> {
387+
self.inner
388+
.on_wrap_env_enter
389+
.as_ref()
390+
.map(|a| PyAction { inner: a.clone() })
391+
}
392+
393+
#[getter]
394+
#[pyo3(name = "onWrapEnvEnter")]
395+
fn on_wrap_env_enter_camel(&self) -> Option<PyAction> {
396+
self.on_wrap_env_enter()
397+
}
398+
399+
#[getter]
400+
fn on_wrap_task_run(&self) -> Option<PyAction> {
401+
self.inner
402+
.on_wrap_task_run
403+
.as_ref()
404+
.map(|a| PyAction { inner: a.clone() })
405+
}
406+
407+
#[getter]
408+
#[pyo3(name = "onWrapTaskRun")]
409+
fn on_wrap_task_run_camel(&self) -> Option<PyAction> {
410+
self.on_wrap_task_run()
411+
}
412+
413+
#[getter]
414+
fn on_wrap_env_exit(&self) -> Option<PyAction> {
415+
self.inner
416+
.on_wrap_env_exit
417+
.as_ref()
418+
.map(|a| PyAction { inner: a.clone() })
419+
}
420+
421+
#[getter]
422+
#[pyo3(name = "onWrapEnvExit")]
423+
fn on_wrap_env_exit_camel(&self) -> Option<PyAction> {
424+
self.on_wrap_env_exit()
425+
}
426+
373427
fn __repr__(&self) -> String {
374428
format!(
375429
"EnvironmentActions(on_enter={}, on_exit={})",
@@ -398,6 +452,15 @@ impl PyEnvironmentActions {
398452
if let Some(a) = slf.on_exit() {
399453
kwargs.set_item("on_exit", a)?;
400454
}
455+
if let Some(a) = slf.on_wrap_env_enter() {
456+
kwargs.set_item("on_wrap_env_enter", a)?;
457+
}
458+
if let Some(a) = slf.on_wrap_task_run() {
459+
kwargs.set_item("on_wrap_task_run", a)?;
460+
}
461+
if let Some(a) = slf.on_wrap_env_exit() {
462+
kwargs.set_item("on_wrap_env_exit", a)?;
463+
}
401464
let cls = py.get_type::<PyEnvironmentActions>();
402465
let args = PyTuple::new(py, [cls.into_any(), kwargs.into_any()])?;
403466
Ok((helper, args.into()))

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

Lines changed: 13 additions & 3 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,
@@ -573,8 +578,13 @@ impl PySession {
573578
run_action(session, session_arc, snapshot, move |rt, session| {
574579
let env_ref = os_env_vars.as_ref();
575580
let task_ref = task_params.as_ref();
576-
let _ =
577-
rt.block_on(session.run_task(&script, task_ref, resolved.as_ref(), env_ref));
581+
let _ = rt.block_on(session.run_task(
582+
&step_name,
583+
&script,
584+
task_ref,
585+
resolved.as_ref(),
586+
env_ref,
587+
));
578588
});
579589
});
580590

0 commit comments

Comments
 (0)