📌 ISSUE-#23: Code improvement

Author: FernandoCelmer

dotflow/__init__.py

@@ -2,10 +2,10 @@
 
 __version__ = "0.3.0"
 
-from .core.actions import Action as action
-from .core.actions import retry  # deprecated
-from .core.workflow import DotFlow
+from .core.action import Action as action
 from .core.context import Context
+from .core.decorators import retry  # deprecated
+from .core.workflow import DotFlow
 
 
 __all__ = [

dotflow/core/action.py

@@ -0,0 +1,45 @@
+"""Action module"""
+
+from typing import Callable
+
+from dotflow.core.context import Context
+
+
+class Action(object):
+
+    def __init__(self, func: Callable = None, retry: int = 1):
+        self.func = func
+        self.retry = retry
+
+    def __call__(self, *args, **kwargs):
+        if self.func:
+            if self._has_context():
+                context = kwargs.get("previous_context") or Context()
+                return Context(storage=self._retry(*args, previous_context=context))
+            else:
+                return Context(storage=self._retry(*args))
+
+        def wrapper(*_args, **_kwargs):
+            self.func = args[0]
+            if self._has_context():
+                context = _kwargs.get("previous_context") or Context()
+                return Context(storage=self._retry(*_args, previous_context=context))
+            else:
+                return Context(storage=self._retry(*_args))
+        return wrapper
+
+    def _retry(self, *args, **kwargs):
+        attempt = 0
+        exception = Exception()
+
+        while self.retry > attempt:
+            try:
+                return self.func(*args, **kwargs)
+            except Exception as error:
+                exception = error
+                attempt += 1
+
+        raise exception
+
+    def _has_context(self):
+        return 'previous_context' in self.func.__code__.co_varnames

dotflow/core/actions.py

@@ -8,8 +8,8 @@ class Context:
 
     def __init__(self, storage: Any = None) -> None:
         self.time = datetime.now()
-        self.storage = storage
 
         if isinstance(storage, Context):
-            self.time = storage.time
             self.storage = storage.storage
+        else:
+            self.storage = storage

dotflow/core/context.py

@@ -3,13 +3,13 @@
 import threading
 
 from uuid import uuid4
-from datetime import datetime
 from typing import Callable, List
 
 from dotflow.core.context import Context
 from dotflow.core.status.workflow import WorkflowStatus
 from dotflow.core.task import Task
 from dotflow.core.utils import exec
+from dotflow.core.decorators import time
 
 
 class Controller:
@@ -37,27 +37,20 @@ def _callback_workflow(self, result: Task):
         else:
             self.success(content=result)
 
+    @time
     def _excution(self, task: Task, previous_context: Context):
         task.workflow_id = self.workflow_id
-        task.status = WorkflowStatus.IN_PROGRESS
-        start_time = datetime.now()
+        task.set_status(WorkflowStatus.IN_PROGRESS)
+        task.set_previous_context(previous_context)
 
         try:
             current_context = task.step(previous_context=previous_context)
-            duration = int((datetime.now() - start_time).total_seconds())
-
-            task.status = WorkflowStatus.COMPLETED
-            task.current_context = current_context
-            task.previous_context = previous_context
-            task.duration = duration
+            task.set_status(WorkflowStatus.COMPLETED)
+            task.set_current_context(current_context)
 
         except Exception as error:
-            duration = int((datetime.now() - start_time).total_seconds())
-
-            task.status = WorkflowStatus.FAILED
-            task.previous_context = previous_context
+            task.set_status(WorkflowStatus.FAILED)
             task.error.append(error)
-            task.duration = duration
 
         task.callback(content=task)
         return task

dotflow/core/controller.py

@@ -1 +1,12 @@
 """Decorators __init__ module."""
+
+from dotflow.core.decorators.action import action
+from dotflow.core.decorators.time import time
+from dotflow.core.decorators.retry import retry
+
+
+__all__ = [
+    "action",
+    "time",
+    "retry"
+]

dotflow/core/decorators/__init__.py

@@ -0,0 +1,17 @@
+"""Action module"""
+
+from dotflow.core.context import Context
+
+
+def action(func):
+    def inside(*args, **kwargs):
+        previous_context = kwargs.get("previous_context") or Context()
+
+        if 'previous_context' in func.__code__.co_varnames:
+            output = func(*args, previous_context=previous_context)
+        else:
+            output = func(*args)
+
+        return Context(storage=output)
+
+    return inside

dotflow/core/decorators/action.py

@@ -0,0 +1,25 @@
+"""Retry module"""
+
+from warnings import warn
+
+
+def retry(max_retry):
+    warn("The 'retry' decorator is deprecated", DeprecationWarning, stacklevel=2)
+
+    def inside(func):
+
+        def wrapper(*args, **kwargs):
+            attempt = 0
+            error_output = Exception()
+
+            while max_retry > attempt:
+                try:
+                    return func(*args, **kwargs)
+                except Exception as error:
+                    error_output = error
+                    attempt += 1
+
+            raise error_output
+
+        return wrapper
+    return inside

dotflow/core/decorators/retry.py

@@ -0,0 +1,12 @@
+"""Time module"""
+
+from datetime import datetime
+
+
+def time(func):
+    def inside(*args, **kwargs):
+            start = datetime.now()
+            task = func(*args, **kwargs)
+            task.set_duration = (datetime.now() - start).total_seconds()
+            return task
+    return inside

dotflow/core/decorators/time.py

@@ -19,8 +19,8 @@ def __init__(self,
                  previous_context: Any = None,
                  status: WorkflowStatus = WorkflowStatus.NOT_STARTED,
                  error: List[Exception] = [],
-                 duration: int = 0,
-                 workflow_id: UUID = None):
+                 duration: float = 0,
+                 workflow_id: UUID = None) -> None:
         self.task_id = task_id
         self.step = step
         self.callback = callback
@@ -31,6 +31,18 @@ def __init__(self,
         self.error = error
         self.duration = duration
         self.workflow_id = workflow_id
+    
+    def set_status(self, value: WorkflowStatus) -> None:
+        self.status = value
+
+    def set_duration(self, value: float) -> None:
+        self.duration = value
+
+    def set_current_context(self, value: Context) -> None:
+        self.current_context = value
+
+    def set_previous_context(self, value: Context) -> None:
+        self.previous_context = value
 
 
 class TaskBuilder: