dotflow 0.16.0.dev2__tar.gz → 0.16.0.dev3__tar.gz

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotflow
-Version: 0.16.0.dev2
+Version: 0.16.0.dev3
 Summary: 🎲 Dotflow turns an idea into flow! Lightweight Python library for execution pipelines with retry, parallel, cron and async support.
 License: Apache License
                                     Version 2.0, January 2004

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/__init__.py

@@ -1,6 +1,6 @@
 """Dotflow __init__ module."""
 
-__version__ = "0.16.0.dev2"
+__version__ = "0.16.0.dev3"
 __description__ = "🎲 Dotflow turns an idea into flow!"
 
 from .core.action import Action as action

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/cli/commands/start.py

@@ -5,6 +5,8 @@ from os import system
 
 from dotflow import Config, DotFlow
 from dotflow.cli.command import Command
+from dotflow.core.exception import InvalidWorkflowFactory, WorkflowFlagConflict
+from dotflow.core.module import Module
 from dotflow.core.types.execution import TypeExecution
 from dotflow.providers import (
     ServerAPI,
@@ -14,10 +16,20 @@ from dotflow.providers import (
     StorageGCS,
     StorageS3,
 )
+from dotflow.utils.basic_functions import basic_callback
 
 
 class StartCommand(Command):
     def setup(self):
+        if getattr(self.params, "workflow", None):
+            self._start_from_factory()
+        else:
+            self._start_from_step()
+
+        if self.params.mode == TypeExecution.BACKGROUND:
+            system("/bin/bash")
+
+    def _start_from_step(self):
         workflow = self._new_workflow()
 
         workflow.task.add(
@@ -28,8 +40,26 @@ class StartCommand(Command):
 
         workflow.start(mode=self.params.mode)
 
-        if self.params.mode == TypeExecution.BACKGROUND:
-            system("/bin/bash")
+    def _start_from_factory(self):
+        step_only_flags = {
+            "--callback": self.params.callback is not basic_callback,
+            "--initial-context": self.params.initial_context is not None,
+        }
+        for flag, provided in step_only_flags.items():
+            if provided:
+                raise WorkflowFlagConflict(flag=flag)
+
+        factory = Module(self.params.workflow)
+
+        if not callable(factory):
+            raise InvalidWorkflowFactory(factory=self.params.workflow)
+
+        result = factory()
+
+        if not isinstance(result, DotFlow):
+            raise InvalidWorkflowFactory(factory=self.params.workflow)
+
+        result.start(mode=self.params.mode)
 
     def _new_workflow(self):
         config = self._build_config()

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/cli/setup.py

@@ -16,7 +16,9 @@ from dotflow.core.exception import (
     MESSAGE_UNKNOWN_ERROR,
     ExecutionModeNotExist,
     ImportModuleError,
+    InvalidWorkflowFactory,
     MissingActionDecorator,
+    WorkflowFlagConflict,
 )
 from dotflow.core.types import TypeExecution, TypeOverlap, TypeStorage
 from dotflow.logging import logger
@@ -56,12 +58,16 @@ class Command:
         self.cmd_init.set_defaults(exec=InitCommand)
 
     def setup_start(self):
-        self.cmd_start = self.subparsers.add_parser("start", help="Start")
-        self.cmd_start = self.cmd_start.add_argument_group(
-            "Usage: dotflow start [OPTIONS]"
+        cmd_start_parser = self.subparsers.add_parser("start", help="Start")
+        entry_group = cmd_start_parser.add_mutually_exclusive_group(
+            required=True
         )
+        entry_group.add_argument("-s", "--step")
+        entry_group.add_argument("-w", "--workflow")
 
-        self.cmd_start.add_argument("-s", "--step", required=True)
+        self.cmd_start = cmd_start_parser.add_argument_group(
+            "Usage: dotflow start [OPTIONS]"
+        )
         self.cmd_start.add_argument("-c", "--callback", default=basic_callback)
         self.cmd_start.add_argument("-i", "--initial-context")
         self.cmd_start.add_argument(
@@ -88,7 +94,7 @@ class Command:
             ],
         )
 
-        self.cmd_start.set_defaults(exec=StartCommand)
+        cmd_start_parser.set_defaults(exec=StartCommand)
 
     def setup_schedule(self):
         self.cmd_schedule = self.subparsers.add_parser(
@@ -233,6 +239,12 @@ class Command:
         except ImportModuleError as err:
             print(settings.WARNING_ALERT, err)
 
+        except InvalidWorkflowFactory as err:
+            print(settings.WARNING_ALERT, err)
+
+        except WorkflowFlagConflict as err:
+            print(settings.WARNING_ALERT, err)
+
         except KeyboardInterrupt:
             print("\n", settings.INFO_ALERT, "Aborted.")
 

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/core/engine.py

@@ -257,13 +257,14 @@ class TaskEngine:
 
         for new in ordered_list:
             new_object = getattr(class_instance, new[1])
+            task_ulid = str(ULID())
             try:
                 subcontext = new_object(
                     initial_context=self.task.initial_context,
                     previous_context=previous_context,
                     task=self.task,
                 )
-                subcontext.task_id = str(ULID())
+                subcontext.task_id = task_ulid
                 new_context.storage.append(subcontext)
                 previous_context = subcontext
 
@@ -277,7 +278,7 @@ class TaskEngine:
                     previous_context=previous_context,
                     task=self.task,
                 )
-                subcontext.task_id = str(ULID())
+                subcontext.task_id = task_ulid
                 new_context.storage.append(subcontext)
                 previous_context = subcontext
 

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/core/exception.py

@@ -15,6 +15,12 @@ MESSAGE_PROBLEM_ORDERING = (
 MESSAGE_MODULE_NOT_FOUND = (
     "Module '{module}' not found. Please install with 'pip install {library}'"
 )
+MESSAGE_INVALID_WORKFLOW_FACTORY = (
+    "'{factory}' must be a callable that returns a DotFlow instance."
+)
+MESSAGE_WORKFLOW_FLAG_CONFLICT = (
+    "{flag} is only valid with --step and cannot be used with --workflow."
+)
 
 
 class MissingActionDecorator(Exception):
@@ -49,6 +55,18 @@ class ModuleNotFound(Exception):
         )
 
 
+class InvalidWorkflowFactory(Exception):
+    def __init__(self, factory: str):
+        super().__init__(
+            MESSAGE_INVALID_WORKFLOW_FACTORY.format(factory=factory)
+        )
+
+
+class WorkflowFlagConflict(Exception):
+    def __init__(self, flag: str):
+        super().__init__(MESSAGE_WORKFLOW_FLAG_CONFLICT.format(flag=flag))
+
+
 class ExecutionWithClassError(Exception):
     def __init__(self):
         super().__init__("Unknown")

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/dotflow/providers/server_api.py

@@ -79,6 +79,7 @@ class ServerAPI(Server):
 
     def update_task(self, task: Any) -> None:
         data = task.result(max=5_000_000)
+        data["id"] = data.pop("task_id", task.task_id)
         self._patch(
             (
                 f"{self._base_url}/workflows/{task.workflow_id}"

{dotflow-0.16.0.dev2 → dotflow-0.16.0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dotflow"
-version = "0.16.0.dev2"
+version = "0.16.0.dev3"
 authors = [
   { name="Fernando Celmer", email="email@fernandocelmer.com" },
 ]
@@ -67,7 +67,7 @@ sentry = ["sentry-sdk"]
 
 [tool.poetry]
 name = "dotflow"
-version = "0.16.0.dev2"
+version = "0.16.0.dev3"
 description = "🎲 Dotflow turns an idea into flow! Lightweight Python library for execution pipelines with retry, parallel, cron and async support."
 authors = ["Fernando Celmer <email@fernandocelmer.com>"]
 readme = "README.md"