Skip to content

Commit 68812a4

Browse files
author
Andrei Neagu
committed
added context integrity check tests
1 parent e9a8f0e commit 68812a4

File tree

4 files changed

+290
-25
lines changed

4 files changed

+290
-25
lines changed

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/generic_scheduler/_deferred_runner.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,24 +181,24 @@ async def run(cls, context: DeferredContext) -> None:
181181

182182
if is_creating:
183183
required_context = await opration_context_proxy.get_required_context(
184-
*step.get_create_requires_operation_context_keys()
184+
*step.get_create_requires_context_keys()
185185
)
186186
_raise_if_any_context_value_is_none(required_context)
187187

188188
provided_operation_context = await step.create(app, required_context)
189-
create_provides_keys = step.get_create_provides_operation_context_keys()
189+
create_provides_keys = step.get_create_provides_context_keys()
190190

191191
_raise_if_provided_context_keys_are_missing_or_none(
192192
provided_operation_context, create_provides_keys
193193
)
194194
else:
195195
required_context = await opration_context_proxy.get_required_context(
196-
*step.get_revert_requires_operation_context_keys()
196+
*step.get_revert_requires_context_keys()
197197
)
198198
_raise_if_any_context_value_is_none(required_context)
199199

200200
provided_operation_context = await step.revert(app, required_context)
201-
revert_provides_keys = step.get_revert_provides_operation_context_keys()
201+
revert_provides_keys = step.get_revert_provides_context_keys()
202202

203203
_raise_if_provided_context_keys_are_missing_or_none(
204204
provided_operation_context, revert_provides_keys

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/generic_scheduler/_operation.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ async def create(
4343
"""
4444

4545
@classmethod
46-
def get_create_requires_operation_context_keys(cls) -> set[str]:
46+
def get_create_requires_context_keys(cls) -> set[str]:
4747
"""
4848
[optional] keys that must be present in the OperationContext when CREATE is called
4949
"""
5050
return set()
5151

5252
@classmethod
53-
def get_create_provides_operation_context_keys(cls) -> set[str]:
53+
def get_create_provides_context_keys(cls) -> set[str]:
5454
"""
5555
[optional] keys that will be added to the OperationContext when CREATE is successful
5656
"""
@@ -93,14 +93,14 @@ async def revert(
9393
return {}
9494

9595
@classmethod
96-
def get_revert_requires_operation_context_keys(cls) -> set[str]:
96+
def get_revert_requires_context_keys(cls) -> set[str]:
9797
"""
9898
[optional] keys that must be present in the OperationContext when REVERT is called
9999
"""
100100
return set()
101101

102102
@classmethod
103-
def get_revert_provides_operation_context_keys(cls) -> set[str]:
103+
def get_revert_provides_context_keys(cls) -> set[str]:
104104
"""
105105
[optional] keys that will be added to the OperationContext when REVERT is successful
106106
"""
@@ -260,19 +260,19 @@ def _validate_operation(operation: Operation) -> dict[StepName, type[BaseStep]]:
260260

261261
detected_steps_names[step_name] = step
262262

263-
for key in step.get_create_provides_operation_context_keys():
263+
for key in step.get_create_provides_context_keys():
264264
if key in create_provided_keys:
265265
msg = (
266266
f"Step {step_name=} provides already provided {key=} in "
267-
f"{step.get_create_provides_operation_context_keys.__name__}()"
267+
f"{step.get_create_provides_context_keys.__name__}()"
268268
)
269269
raise ValueError(msg)
270270
create_provided_keys.add(key)
271-
for key in step.get_revert_provides_operation_context_keys():
271+
for key in step.get_revert_provides_context_keys():
272272
if key in revert_provided_keys:
273273
msg = (
274274
f"Step {step_name=} provides already provided {key=} in "
275-
f"{step.get_revert_provides_operation_context_keys.__name__}()"
275+
f"{step.get_revert_provides_context_keys.__name__}()"
276276
)
277277
raise ValueError(msg)
278278
revert_provided_keys.add(key)
@@ -296,7 +296,8 @@ def get_operation_provided_context_keys(operation: Operation) -> set[str]:
296296

297297
for step_group in operation:
298298
for step in step_group.get_step_subgroup_to_run():
299-
provided_keys.update(step.get_create_provides_operation_context_keys())
299+
provided_keys.update(step.get_create_provides_context_keys())
300+
provided_keys.update(step.get_revert_provides_context_keys())
300301

301302
return provided_keys
302303

0 commit comments

Comments
 (0)