feat: Instance response running_workflow_step now running_workflow_step_id

Author: Alan Christie

tests/wapi_adapter.py

@@ -282,7 +282,7 @@ def create_instance(self, *, running_workflow_step_id: str) -> dict[str, Any]:
         next_id: int = len(instances) + 1
         instance_id: str = _INSTANCE_ID_FORMAT.format(id=next_id)
         record = {
-            "running_workflow_step": running_workflow_step_id,
+            "running_workflow_step_id": running_workflow_step_id,
         }
         instances[instance_id] = record
 

workflow/workflow_engine.py

@@ -213,7 +213,8 @@ def _handle_pod_message(self, msg: PodMessage) -> None:
         _LOGGER.debug(
             "API.get_instance(%s) returned: -\n%s", instance_id, str(response)
         )
-        r_wfsid: str = response["running_workflow_step"]
+        r_wfsid: str | None = response.get("running_workflow_step_id")
+        assert r_wfsid
         rwfs_response, _ = self._wapi_adapter.get_running_workflow_step(
             running_workflow_step_id=r_wfsid
         )
@@ -225,7 +226,7 @@ def _handle_pod_message(self, msg: PodMessage) -> None:
         step_name: str = rwfs_response["name"]
 
         # Get the step's running workflow record.
-        r_wfid = rwfs_response["running_workflow"]
+        r_wfid: str = rwfs_response["running_workflow"]
         assert r_wfid
         rwf_response, _ = self._wapi_adapter.get_running_workflow(
             running_workflow_id=r_wfid
@@ -280,7 +281,7 @@ def _handle_pod_message(self, msg: PodMessage) -> None:
                         str(response),
                     )
                     assert "id" in rwfs_response
-                    r_wfsid = rwfs_response["id"]
+                    new_r_wfsid: str = rwfs_response["id"]
                     project_id = rwf_response["project"]["id"]
                     variables = rwf_response["variables"]
                     lp: LaunchParameters = LaunchParameters(
@@ -292,15 +293,15 @@ def _handle_pod_message(self, msg: PodMessage) -> None:
                         specification=json.loads(next_step["specification"]),
                         specification_variables=variables,
                         running_workflow_id=r_wfid,
-                        running_workflow_step_id=r_wfsid,
+                        running_workflow_step_id=new_r_wfsid,
                     )
                     lr = self._instance_launcher.launch(lp)
                     # Handle a launch error?
                     if lr.error_num:
                         self._set_step_error(
                             next_step_name,
                             r_wfid,
-                            r_wfsid,
+                            new_r_wfsid,
                             lr.error_num,
                             lr.error_msg,
                         )