📌 ISSUE-#23: Code improvement

Author: FernandoCelmer

dotflow/core/actions.py

@@ -57,17 +57,17 @@ def __call__(self, *args, **kwargs):
         if self._func:
             if 'previous_context' in self._func.__code__.co_varnames:
                 previous_context = kwargs.get("previous_context") or Context()
-                return self.output(content=self.retry(*args, previous_context=previous_context))
+                return Context(storage=self.retry(*args, previous_context=previous_context))
             else:
-                return self.output(content=self.retry(*args))
+                return Context(storage=self.retry(*args))
 
         def wrapper(*_args, **_kwargs):
             self._func = args[0]
             if 'previous_context' in args[0].__code__.co_varnames:
                 previous_context = _kwargs.get("previous_context") or Context()
-                return self.output(content=self.retry(*_args, previous_context=previous_context))
+                return Context(storage=self.retry(*_args, previous_context=previous_context))
             else:
-                return self.output(content=self.retry(*_args))
+                return Context(storage=self.retry(*_args))
         return wrapper
 
     def retry(self, *args, **kwargs):
@@ -82,10 +82,3 @@ def retry(self, *args, **kwargs):
                 attempt += 1
 
         raise error_output
-
-    def output(self, content: Any):
-        if content:
-            if isinstance(content, Context):
-                return content
-            return Context(storage=content)
-        return Context()

dotflow/core/controller.py

@@ -7,7 +7,7 @@
 from typing import Callable, List
 
 from dotflow.core.context import Context
-from dotflow.core.status.step import StepStatus
+from dotflow.core.status.workflow import WorkflowStatus
 from dotflow.core.task import Task
 from dotflow.core.utils import exec
 
@@ -32,13 +32,14 @@ def __init__(self,
 
     def _callback_workflow(self, result: Task):
         final_status = [flow.status for flow in result]
-        if StepStatus.FAILED in final_status:
+        if WorkflowStatus.FAILED in final_status:
             self.failure(content=result)
         else:
             self.success(content=result)
 
     def _excution(self, task: Task, previous_context: Context):
         task.workflow_id = self.workflow_id
+        task.status = WorkflowStatus.IN_PROGRESS
         start_time = datetime.now()
 
         try:

dotflow/core/status/step.py

@@ -1,7 +1,10 @@
-"""Workflow Status module"""
+"""Step Status module"""
 
 class WorkflowStatus:
 
-    FAILED = "Failed"
-    COMPLETED = "Completed"
+    NOT_STARTED = "Not started"
     IN_PROGRESS = "In progress"
+    COMPLETED = "Completed"
+    PAUSED = "Paused"
+    RETRY = "Retry"
+    FAILED = "Failed"

dotflow/core/status/workflow.py

@@ -4,7 +4,7 @@
 from typing import Any, Callable, List
 
 from dotflow.core.context import Context
-from dotflow.core.status.step import StepStatus
+from dotflow.core.status.workflow import WorkflowStatus
 from dotflow.core.utils import callback
 
 
@@ -17,7 +17,7 @@ def __init__(self,
                  initial_context: Any = None,
                  current_context: Any = None,
                  previous_context: Any = None,
-                 status: StepStatus = StepStatus.NOT_STARTED,
+                 status: WorkflowStatus = WorkflowStatus.NOT_STARTED,
                  error: List[Exception] = [],
                  duration: int = 0,
                  workflow_id: UUID = None):