dotflow 0.9.0.dev1__tar.gz → 0.9.0.dev2__tar.gz

{dotflow-0.9.0.dev1 → dotflow-0.9.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dotflow
-Version: 0.9.0.dev1
+Version: 0.9.0.dev2
 Summary: 🎲 Dotflow turns an idea into flow!
 License: MIT License
          

{dotflow-0.9.0.dev1 → dotflow-0.9.0.dev2}/dotflow/__init__.py

@@ -1,6 +1,6 @@
 """Dotflow __init__ module."""
 
-__version__ = "0.9.0.dev1"
+__version__ = "0.9.0.dev2"
 __description__ = "🎲 Dotflow turns an idea into flow!"
 
 from .core.config import Config

{dotflow-0.9.0.dev1 → dotflow-0.9.0.dev2}/dotflow/cli/setup.py

@@ -93,5 +93,5 @@ class Command:
             print(settings.WARNING_ALERT, err)
 
         except Exception as err:
-            logger.error(err)
+            logger.error(f"Internal problem: {str(err)}")
             print(settings.ERROR_ALERT, MESSAGE_UNKNOWN_ERROR)

{dotflow-0.9.0.dev1 → dotflow-0.9.0.dev2}/dotflow/core/exception.py

@@ -5,7 +5,7 @@ MESSAGE_MISSING_STEP_DECORATOR = "A step function necessarily needs an '@action'
 MESSAGE_NOT_CALLABLE_OBJECT = "Problem validating the '{name}' object type; this is not a callable object"
 MESSAGE_EXECUTION_NOT_EXIST = "The execution mode does not exist. Allowed parameter is 'sequential' and 'background'."
 MESSAGE_MODULE_NOT_FOUND = "Problem importing the python module '{module}'."
-
+MESSAGE_PROBLEM_ORDERING = "Problem with correctly ordering functions of the '{name}' class."
 
 class MissingActionDecorator(Exception):
 
@@ -42,3 +42,12 @@ class NotCallableObject(Exception):
             )
         )
 
+
+class ProblemOrdering(Exception):
+
+    def __init__(self, name: str):
+        super(ProblemOrdering, self).__init__(
+            MESSAGE_PROBLEM_ORDERING.format(
+                name=name
+            )
+        )

dotflow-0.9.0.dev2/dotflow/core/execution.py

@@ -0,0 +1,138 @@
+"""Execution module"""
+
+from uuid import UUID
+from typing import Callable, List, Tuple
+from inspect import getsourcelines
+from types import FunctionType, NoneType
+
+from dotflow.logging import logger
+from dotflow.core.action import Action
+from dotflow.core.context import Context
+from dotflow.core.task import Task
+from dotflow.core.types import TaskStatus
+
+from dotflow.core.decorators import time
+
+
+class Execution:
+
+    VALID_OBJECTS = [
+        str,
+        int,
+        float,
+        dict,
+        list,
+        tuple,
+        set,
+        bool,
+        FunctionType,
+        NoneType
+    ]
+
+    def __init__(
+        self,
+        task: Task,
+        workflow_id: UUID,
+        previous_context: Context
+    ) -> None:
+        self.task = task
+        self.task.status = TaskStatus.IN_PROGRESS
+        self.task.previous_context = previous_context
+        self.task.workflow_id = workflow_id
+
+        self._excution()
+
+    def _is_action(self, class_instance: Callable, func: Callable):
+        return (
+            callable(getattr(class_instance, func))
+            and not func.startswith("__")
+            and getattr(class_instance, func).__module__ is Action.__module__
+        )
+
+    def _execution_orderer(
+            self,
+            callable_list: List[str],
+            class_instance: Callable
+    ) -> Tuple[int, Callable]:
+        ordered_list = []
+
+        try:
+            inside_code = getsourcelines(class_instance.__class__)[0]
+
+            for callable_name in callable_list:
+                for index, code in enumerate(inside_code):
+                    if code.find(f"def {callable_name}") != -1:
+                        ordered_list.append((index, callable_name))
+
+            ordered_list.sort()
+            return ordered_list
+
+        except TypeError as err:
+            logger.error(f"Internal problem: {str(err)}")
+
+        for index, callable_name in enumerate(callable_list):
+            ordered_list.append((index, callable_name))
+
+        return ordered_list
+
+    def _execution_with_class(self, class_instance: Callable):
+        new_context = Context(storage=[])
+        previous_context = self.task.previous_context
+        callable_list = [
+            func
+            for func in dir(class_instance)
+            if self._is_action(class_instance, func)
+        ]
+
+        ordered_list = self._execution_orderer(
+            callable_list=callable_list, class_instance=class_instance
+        )
+
+        for _, new in ordered_list:
+            new_object = getattr(class_instance, new)
+            try:
+                subcontext = new_object(
+                    initial_context=self.task.initial_context,
+                    previous_context=previous_context,
+                )
+                new_context.storage.append(subcontext)
+                previous_context = subcontext
+
+            except Exception:
+                subcontext = new_object(
+                    class_instance,
+                    initial_context=self.task.initial_context,
+                    previous_context=previous_context,
+                )
+                new_context.storage.append(subcontext)
+                previous_context = subcontext
+
+        if not new_context.storage:
+            return Context(storage=class_instance)
+
+        return new_context
+
+    @time
+    def _excution(self):
+        try:
+            current_context = self.task.step(
+                initial_context=self.task.initial_context,
+                previous_context=self.task.previous_context,
+            )
+
+            if type(current_context.storage) not in self.VALID_OBJECTS:
+                current_context = self._execution_with_class(
+                    class_instance=current_context.storage
+                )
+
+            self.task.status = TaskStatus.COMPLETED
+            self.task.current_context = current_context
+
+        except Exception as err:
+            self.task.status = TaskStatus.FAILED
+            self.task.error = err
+
+        finally:
+            self.task.callback(content=self.task)
+
+        return self.task

{dotflow-0.9.0.dev1 → dotflow-0.9.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dotflow"
-version = "0.9.0.dev1"
+version = "0.9.0.dev2"
 authors = [
   { name="Fernando Celmer", email="email@fernandocelmer.com" },
 ]
@@ -31,7 +31,7 @@ Documentation = "https://github.com/dotflow-io/dotflow/blob/master/README.md"
 
 [tool.poetry]
 name = "dotflow"
-version = "0.9.0.dev1"
+version = "0.9.0.dev2"
 description = "🎲 Dotflow turns an idea into flow!"
 authors = ["Fernando Celmer <email@fernandocelmer.com>"]
 readme = "README.md"

dotflow-0.9.0.dev1/dotflow/core/execution.py

@@ -1,86 +0,0 @@
-"""Execution module"""
-
-from uuid import UUID
-from typing import Callable
-
-from dotflow.core.action import Action
-from dotflow.core.context import Context
-from dotflow.core.task import Task
-from dotflow.core.types import TaskStatus
-
-from dotflow.core.decorators import time
-
-
-class Execution:
-
-    def __init__(
-        self,
-        task: Task,
-        workflow_id: UUID,
-        previous_context: Context
-    ) -> None:
-        self.task = task
-        self.task.status = TaskStatus.IN_PROGRESS
-        self.task.previous_context = previous_context
-        self.task.workflow_id = workflow_id
-
-        self._excution()
-
-    def _execution_with_class(self, class_instance: Callable):
-        context = Context(storage=[])
-        previous_context = self.task.previous_context
-
-        for func_name in dir(class_instance):
-            additional_function = getattr(class_instance, func_name)
-
-            if isinstance(additional_function, Action):
-                try:
-                    current_context = additional_function(
-                        initial_context=self.task.initial_context,
-                        previous_context=previous_context,
-                    )
-                    context.storage.append(current_context)
-                    previous_context = current_context
-                except TypeError:
-                    current_context = additional_function(
-                        class_instance,
-                        initial_context=self.task.initial_context,
-                        previous_context=previous_context,
-                    )
-                    context.storage.append(current_context)
-                    previous_context = current_context
-
-        if not context.storage:
-            return Context(storage=class_instance)
-
-        return context
-
-    @time
-    def _excution(self):
-        try:
-            current_context = self.task.step(
-                initial_context=self.task.initial_context,
-                previous_context=self.task.previous_context,
-            )
-
-            object_attributes = [
-                type(getattr(current_context.storage, param)) is Action
-                for param in dir(current_context.storage)
-            ]
-
-            if True in object_attributes:
-                current_context = self._execution_with_class(
-                    class_instance=current_context.storage
-                )
-
-            self.task.status = TaskStatus.COMPLETED
-            self.task.current_context = current_context
-
-        except Exception as err:
-            self.task.status = TaskStatus.FAILED
-            self.task.error = err
-
-        finally:
-            self.task.callback(content=self.task)
-
-        return self.task