From feb25c286d590d90a9dac9a9ba71ec28bf1fa380 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 13 Feb 2023 10:10:23 -0500 Subject: [PATCH] more finally for better len added a fixme for raising errors fixed up an error message --- .../routes/process_instances_controller.py | 1 + .../services/process_instance_processor.py | 23 ++++++++++--------- .../services/service_task_service.py | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py index 800c50c98..40a0147f8 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py @@ -125,6 +125,7 @@ def process_instance_run( raise e except Exception as e: ErrorHandlingService().handle_error(processor, e) + # fixme: this is going to point someone to the wrong task - it's misinformation for errors in sub-processes task = processor.bpmn_process_instance.last_task raise ApiError.from_task( error_code="unknown_exception", diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py index f30ebd4b3..3090aa5cd 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py @@ -208,20 +208,21 @@ class NonTaskDataBasedScriptEngineEnvironment(BasePythonScriptEngineEnvironment) self.state.update(self.globals) self.state.update(external_methods or {}) self.state.update(context) - exec(script, self.state) # noqa + try: + exec(script, self.state) # noqa + finally: + # since the task data is not directly mutated when the script executes, need to determine which keys + # have been deleted from the environment and remove them from task data if present. + context_keys_to_drop = context.keys() - self.state.keys() - # since the task data is not directly mutated when the script executes, need to determine which keys - # have been deleted from the environment and remove them from task data if present. - context_keys_to_drop = context.keys() - self.state.keys() + for key_to_drop in context_keys_to_drop: + context.pop(key_to_drop) - for key_to_drop in context_keys_to_drop: - context.pop(key_to_drop) + self.state = self._user_defined_state(external_methods) - self.state = self._user_defined_state(external_methods) - - # the task data needs to be updated with the current state so data references can be resolved properly. - # the state will be removed later once the task is completed. - context.update(self.state) + # the task data needs to be updated with the current state so data references can be resolved properly. + # the state will be removed later once the task is completed. + context.update(self.state) def _user_defined_state( self, external_methods: Optional[Dict[str, Any]] = None diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/service_task_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/service_task_service.py index 982436112..2ff09af2e 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/service_task_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/service_task_service.py @@ -113,7 +113,7 @@ class ServiceTaskDelegate: message = ServiceTaskDelegate.get_message_for_status( proxied_response.status_code ) - error = f"Received an unexpected response from the service : {message}" + error = f"Received an unexpected response from service {name} : {message}" if "error" in parsed_response: error += parsed_response["error"] if json_parse_error: