⚙️ fixed: remove default context from result dataclass model.

Author: korawica

src/ddeutil/workflow/result.py

@@ -166,10 +166,6 @@ def get_status_from_error(
     return FAILED
 
 
-def default_context() -> DictData:
-    return {"status": WAIT}
-
-
 @dataclass(
     config=ConfigDict(arbitrary_types_allowed=True, use_enum_values=True),
 )
@@ -188,7 +184,7 @@ class Result:
 
     extras: DictData = field(default_factory=dict, compare=False, repr=False)
     status: Status = field(default=WAIT)
-    context: DictData = field(default_factory=default_context)
+    context: Optional[DictData] = field(default=None)
     info: DictData = field(default_factory=dict)
     run_id: str = field(default_factory=default_gen_id)
     parent_run_id: Optional[str] = field(default=None)
@@ -207,11 +203,18 @@ def __prepare_trace(self) -> Self:
                 extras=self.extras,
             )
 
-        if self.parent_run_id is None:
-            self.parent_run_id = self.run_id
-
         return self
 
+    @classmethod
+    def from_trace(cls, trace: Trace):
+        """Construct the result model from trace for clean code objective."""
+        return cls(
+            run_id=trace.run_id,
+            parent_run_id=trace.parent_run_id,
+            extras=trace.extras,
+            trace=trace,
+        )
+
     def catch(
         self,
         status: Union[int, Status],
@@ -227,7 +230,11 @@ def catch(
 
         :rtype: Self
         """
-        self.__dict__["context"].update(context or {})
+        if self.__dict__["context"] is None:
+            self.__dict__["context"] = context
+        else:
+            self.__dict__["context"].update(context or {})
+
         self.__dict__["status"] = (
             Status(status) if isinstance(status, int) else status
         )

src/ddeutil/workflow/workflow.py

@@ -939,12 +939,9 @@ def rerun(
                 "[WORKFLOW]: Does not rerun because it already executed with "
                 "success status."
             )
-            return Result(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
+            return Result.from_trace(trace).catch(
                 status=SUCCESS,
                 context=catch(context=context, status=SUCCESS),
-                extras=self.extras,
             )
 
         err: dict[str, str] = context.get("errors", {})
@@ -960,12 +957,9 @@ def rerun(
         )
         if not self.jobs:
             trace.warning(f"[WORKFLOW]: {self.name!r} does not set jobs")
-            return Result(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
+            return Result.from_trace(trace).catch(
                 status=SUCCESS,
                 context=catch(context=context, status=SUCCESS),
-                extras=self.extras,
             )
 
         # NOTE: Prepare the new context variable for rerun process.
@@ -990,12 +984,9 @@ def rerun(
                 "[WORKFLOW]: It does not have job to rerun. it will change "
                 "status to skip."
             )
-            return Result(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
+            return Result.from_trace(trace).catch(
                 status=SKIP,
                 context=catch(context=context, status=SKIP),
-                extras=self.extras,
             )
 
         not_timeout_flag: bool = True
@@ -1008,9 +999,7 @@ def rerun(
 
         catch(context, status=WAIT)
         if event and event.is_set():
-            return Result(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
+            return Result.from_trace(trace).catch(
                 status=CANCEL,
                 context=catch(
                     context,
@@ -1022,7 +1011,6 @@ def rerun(
                         ).to_dict(),
                     },
                 ),
-                extras=self.extras,
             )
 
         with ThreadPoolExecutor(max_job_parallel, "wf") as executor:
@@ -1050,9 +1038,7 @@ def rerun(
                 backoff_sleep = 0.01
 
                 if check == FAILED:  # pragma: no cov
-                    return Result(
-                        run_id=run_id,
-                        parent_run_id=parent_run_id,
+                    return Result.from_trace(trace).catch(
                         status=FAILED,
                         context=catch(
                             context,
@@ -1065,7 +1051,6 @@ def rerun(
                                 ).to_dict(),
                             },
                         ),
-                        extras=self.extras,
                     )
                 elif check == SKIP:  # pragma: no cov
                     trace.info(
@@ -1141,12 +1126,9 @@ def rerun(
                     statuses[total + 1 + skip_count + i] = s
 
                 st: Status = validate_statuses(statuses)
-                return Result(
-                    run_id=run_id,
-                    parent_run_id=parent_run_id,
+                return Result.from_trace(trace).catch(
                     status=st,
                     context=catch(context, status=st),
-                    extras=self.extras,
                 )
 
             event.set()
@@ -1160,9 +1142,7 @@ def rerun(
 
             time.sleep(0.0025)
 
-        return Result(
-            run_id=run_id,
-            parent_run_id=parent_run_id,
+        return Result.from_trace(trace).catch(
             status=FAILED,
             context=catch(
                 context,
@@ -1174,5 +1154,4 @@ def rerun(
                     ).to_dict(),
                 },
             ),
-            extras=self.extras,
         )

tests/test_result.py

@@ -29,9 +29,9 @@ def test_result_default():
     time.sleep(0.025)
     rs2 = Result()
     assert rs.status == Status.WAIT
-    assert rs.context == {"status": Status.WAIT}
+    assert rs.context is None
     assert rs2.status == Status.WAIT
-    assert rs2.context == {"status": Status.WAIT}
+    assert rs2.context is None
 
     # NOTE: Result objects should not equal because they do not have the same
     #   running ID value.
@@ -51,9 +51,6 @@ def test_result_context():
 
 def test_result_catch():
     rs: Result = Result()
-
-    assert rs.run_id == rs.parent_run_id
-
     data = {"params": {"source": "src", "target": "tgt"}}
     rs.catch(status=SUCCESS, context=data)
     assert rs.status == SUCCESS