corrected key

Author: Andrei Neagu

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

@@ -37,18 +37,21 @@ def _get_step_hash_key(
     operation_name: OperationName,
     group: StepGroupName,
     step_name: StepName,
+    is_creating: bool,
 ) -> str:
-    # SCHEDULE_NAMESPACE:SCHEDULE_ID:STEPS:OPERATION_NAME:GROUP_INDEX:STEP_NAME:KEY
+    # SCHEDULE_NAMESPACE:SCHEDULE_ID:STEPS:OPERATION_NAME:GROUP_INDEX:STEP_NAME:IS_CREATING:KEY
     # - SCHEDULE_NAMESPACE: something short to identify tgis
     # - SCHEDULE_ID: the unique scheudle_id assigned
     # - STEPS: the constant "STEPS"
     # - OPERATION_NAME form the vairble's name during registration
     # - GROUP_INDEX
     #   -> "{index}(S|P)[R]": S=single or P=parallel and optinally, "R" if steps should be repeated forever
+    # - IS_CREATING: "C" or "D" for creation or destruction
     # - STEP_NAME form it's class
     # Example:
-    # - SCH:00000000-0000-0000-0000-000000000000:STEPS:START_SERVICE:0S:BS1
-    return f"{_SCHEDULE_NAMESPACE}:{schedule_id}:{_STEPS_KEY}:{operation_name}:{group}:{step_name}"
+    # - SCH:00000000-0000-0000-0000-000000000000:STEPS:START_SERVICE:0S:C:BS1
+    is_creating_str = "C" if is_creating else "D"
+    return f"{_SCHEDULE_NAMESPACE}:{schedule_id}:{_STEPS_KEY}:{operation_name}:{group}:{is_creating_str}:{step_name}"
 
 
 def _dumps(obj: Any) -> str:
@@ -186,19 +189,22 @@ def __init__(
         operation_name: OperationName,
         step_group_name: StepGroupName,
         step_name: StepName,
+        is_creating: bool,
     ) -> None:
         self._store = store
         self._schedule_id = schedule_id
         self._operation_name = operation_name
         self._group = step_group_name
         self._step_name = step_name
+        self._is_creating = is_creating
 
     def _get_hash_key(self) -> str:
         return _get_step_hash_key(
             schedule_id=self._schedule_id,
             operation_name=self._operation_name,
             group=self._group,
             step_name=self._step_name,
+            is_creating=self._is_creating,
         )
 
     @overload

services/dynamic-scheduler/tests/unit/service_generic_scheduler/test__store.py

@@ -159,16 +159,21 @@ async def test_schedule_data_store_proxy_workflow(
     await _assert_keys_in_hash(store, hash_key, set())
 
 
-async def test_step_store_proxy_workflow(store: Store, schedule_id: ScheduleId):
+@pytest.mark.parametrize("is_creating", [True, False])
+async def test_step_store_proxy_workflow(
+    store: Store, schedule_id: ScheduleId, is_creating: bool
+):
     step_name = "MyStep"
     proxy = StepStoreProxy(
         store=store,
         schedule_id=schedule_id,
         operation_name="op1",
         step_group_name="sg1",
         step_name=step_name,
+        is_creating=is_creating,
     )
-    hash_key = f"SCH:{schedule_id}:STEPS:op1:sg1:{step_name}"
+    is_creating_str = "C" if is_creating else "D"
+    hash_key = f"SCH:{schedule_id}:STEPS:op1:sg1:{is_creating_str}:{step_name}"
 
     # set
     await proxy.set("status", StepStatus.RUNNING)
@@ -191,6 +196,6 @@ async def test_step_store_proxy_workflow(store: Store, schedule_id: ScheduleId):
     await _assert_keys_in_hash(store, hash_key, {"status", "deferred_task_uid"})
 
     # remove all keys an even missing ones
-    await proxy.delete("status")
+    await proxy.delete("status", "deferred_task_uid")
     await _assert_keys(store, set())
     await _assert_keys_in_hash(store, hash_key, set())