Repository navigation
Commit 06e30ee
committed
feat: RFC 0008 environment wrap actions
Implement RFC 0008 WRAP_ACTIONS support in the Python sessions runtime,
allowing environments to wrap task and environment actions via the
onWrapEnvEnter, onWrapTaskRun, and onWrapEnvExit hooks.
- Run wrap hooks through EnvironmentScriptRunner (wrap_env_enter /
wrap_env_exit) and the task-run wrap path, injecting Task.Action.*,
Env.Wrapped.Action.*, and WrappedAction.* symbols per the final RFC
wording.
- Seed WrappedAction.Cancelation.Mode (string?) and
WrappedAction.Cancelation.NotifyPeriodInSeconds (int?) for all three
hooks, applying the Template Schemas 5.3.2 notify-period defaults
(120 seconds for a task's onRun, 30 otherwise). Mode is None when the
wrapped action declares no <Cancelation>, preserving the distinction
from an explicit TERMINATE and rendering as the empty string per
RFC 0005 null semantics.
- Allow normal format string behavior for the cancelation mode per
review feedback on openjd-specifications PR #148: partial
interpolation like "{{ 'NOTIFY' }}_THEN_TERMINATE" is valid, and the
resolved value is checked against the two mode names at run time.
Null semantics (dropping the cancelation object) apply only when the
mode is a whole-field "{{ ... }}" expression, per the Template
Schemas 5.3 wording; a normal format string that resolves to the
empty string is an invalid mode, matching the openjd-rs
typed-resolution behavior.
- Support round-trip cancelation/timeout forwarding: a deferred
cancelation mode (CancelationMethodDeferred) resolves against the
live symbol table via a shared resolve_effective_cancelation helper
used by both the seed path and the cancel enforcement paths, so wrap
scripts always see the values the runtime enforces. WrappedAction.
Timeout is int? (None when the wrapped action has no timeout), and
FormatString timeouts resolve at launch with null meaning "no
timeout field".
- WrappedAction.Environment carries only openjd_env-defined variables,
flattened cumulatively in environment-entry order (overrides and
unsets collapse to the effective entry), with the exiting
environment's own variables captured before removal on the
onWrapEnvExit path.
- Fail gracefully (normal FAIL callback path, session to READY_ENDING)
when WrappedAction.* injection cannot resolve the wrapped action's
format strings, instead of leaking FormatStringError through the
public API.
- Inherit Rust-backed EXPR format-string evaluation transparently from
openjd-model; guard _run_wrap_hook against unknown hook names; warn
when a wrap environment is active but run_task() lacks step_name.
All WRAP_ACTIONS conformance fixtures pass against the Python CLI,
along with the new wrap/cancelation unit test suites.
Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>1 parent f0bfb98 commit 06e30ee
9 files changed
Lines changed: 1980 additions & 84 deletions
File tree
- src/openjd/sessions
- test/openjd/sessions_v0
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| |||
90 | 92 | | |
91 | 93 | | |
92 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
93 | 199 | | |
94 | 200 | | |
95 | 201 | | |
| |||
463 | 569 | | |
464 | 570 | | |
465 | 571 | | |
466 | | - | |
467 | | - | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
468 | 610 | | |
469 | 611 | | |
470 | 612 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | 11 | | |
15 | 12 | | |
16 | 13 | | |
| |||
20 | 17 | | |
21 | 18 | | |
22 | 19 | | |
| 20 | + | |
23 | 21 | | |
24 | 22 | | |
25 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
27 | 30 | | |
28 | 31 | | |
| |||
181 | 184 | | |
182 | 185 | | |
183 | 186 | | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
184 | 233 | | |
185 | 234 | | |
186 | 235 | | |
| |||
191 | 240 | | |
192 | 241 | | |
193 | 242 | | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
194 | 257 | | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
| 258 | + | |
| 259 | + | |
200 | 260 | | |
201 | 261 | | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
211 | 267 | | |
| 268 | + | |
212 | 269 | | |
213 | 270 | | |
214 | 271 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | 11 | | |
15 | 12 | | |
16 | 13 | | |
| |||
19 | 16 | | |
20 | 17 | | |
21 | 18 | | |
| 19 | + | |
22 | 20 | | |
23 | 21 | | |
24 | | - | |
| 22 | + | |
25 | 23 | | |
26 | 24 | | |
27 | 25 | | |
| |||
127 | 125 | | |
128 | 126 | | |
129 | 127 | | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
130 | 144 | | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 145 | + | |
135 | 146 | | |
136 | 147 | | |
137 | 148 | | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
147 | 154 | | |
| 155 | + | |
148 | 156 | | |
149 | 157 | | |
150 | 158 | | |
0 commit comments