feat: error handling for wf module

chkware · Dec 29, 2024 · 5668116 · 5668116
1 parent 71b1f68
commit 5668116
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/chk/modules/workflow/__init__.py b/chk/modules/workflow/__init__.py
@@ -198,36 +198,32 @@ def call(file_ctx: FileContext, exec_ctx: ExecuteContext) -> ExecResponse:
     debug(file_ctx)
     debug(exec_ctx)
 
-    r_exception: Exception | None = None
-    variable_doc = Variables()
-    output_data = Variables()
-    exposed_data = {}
-
     try:
         wflow_doc = WorkflowDocument.from_file_context(file_ctx)
         debug(wflow_doc.model_dump_json())
+    except Exception as ex:
+        error_trace(exception=sys.exc_info()).error(ex)
+        return ExecResponse(file_ctx=file_ctx, exec_ctx=exec_ctx, exception=ex, report={"is_success": False})
 
-        variable_doc = Variables()
-        VariableTableManager.handle(variable_doc, wflow_doc, exec_ctx)
-        debug(variable_doc.data)
+    variable_doc = Variables()
+    VariableTableManager.handle(variable_doc, wflow_doc, exec_ctx)
+    debug(variable_doc.data)
 
+    try:
         service = WorkflowDocumentSupport()
         # @TODO make sure the document do not call self making it repeating
         service.set_step_template(variable_doc)
 
-        with with_catch_log():
-            exec_report = service.process_task_template(wflow_doc, variable_doc)
-
-        output_data = Variables({"_steps": variable_doc[WorkflowConfigNode.NODE.value]})
-        debug(output_data.data)
-
-        exposed_data = ExposeManager.get_exposed_replaced_data(
-            wflow_doc, variable_doc.data
-        )
-        debug(exposed_data)
+        exec_report = service.process_task_template(wflow_doc, variable_doc)
     except Exception as ex:
-        r_exception = ex
         error_trace(exception=sys.exc_info()).error(ex)
+        return ExecResponse(file_ctx=file_ctx, exec_ctx=exec_ctx, exception=ex, report={"is_success": False})
+
+    output_data = Variables({"_steps": variable_doc[WorkflowConfigNode.NODE.value]})
+    debug(output_data.data)
+
+    exposed_data = ExposeManager.get_exposed_replaced_data(wflow_doc, variable_doc.data)
+    debug(exposed_data)
 
     # TODO also send failed_details (fail code, message, stacktrace, etc)
     return ExecResponse(
@@ -237,9 +233,8 @@ def call(file_ctx: FileContext, exec_ctx: ExecuteContext) -> ExecResponse:
         variables_exec=output_data,
         extra=exec_report,
         exposed=exposed_data,
-        exception=r_exception,
         report={
-            "is_success": r_exception is None,
+            "is_success": True,
         },
     )
 

diff --git a/tests/modules/workflow/wf_module_test.py b/tests/modules/workflow/wf_module_test.py
@@ -39,8 +39,11 @@ def test_execute_pass_args(
         captured = capsys.readouterr()
         assert "======" in captured.out
 
+class TestWorkflowCall:
+    """TestWorkflowCall"""
+
     @staticmethod
-    def test_call(load_chk_file, load_file_ctx_for_file, get_exec_ctx):
+    def test_pass(load_chk_file, load_file_ctx_for_file, get_exec_ctx):
         """test_call"""
 
         filepath = f"{SPEC_DIR}workflow_cases/get-req-vars/coinstats-usd-workflow.chk"