dotflow 0.16.0.dev2__py3-none-any.whl → 0.16.0.dev3__py3-none-any.whl

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/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/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/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/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/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.dist-info → dotflow-0.16.0.dev3.dist-info}/METADATA

@@ -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.dist-info → dotflow-0.16.0.dev3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dotflow/__init__.py,sha256=ZTvhDm0gGdFeA5QstasHnD-4keZBIdwnwvFNYUzDk7c,351
+dotflow/__init__.py,sha256=s2BPJpb2wJDmvpPD2J2Lb9GXOguK4z6I0CPw71qqflI,351
 dotflow/abc/__init__.py,sha256=UIk84jCJYoHAk4In_eVXAaFAnNE63lI3dVP5qunyBJs,32
 dotflow/abc/file.py,sha256=QEDIS-AXaW3GK5q5ckhNdoC5A3p8oOFE7VyNGSvx540,296
 dotflow/abc/flow.py,sha256=j6m9u13UXgBCIhgrUwzvBBYHTDul_DfERD4DWA1BQBw,1436
@@ -19,9 +19,9 @@ dotflow/cli/commands/deploy.py,sha256=qUeZx-C00OfOEMURNZ4LMRI4qYOwwDS_ajOGtLa_Wb
 dotflow/cli/commands/init.py,sha256=VySDg1gNx_8jH0vfhc15BhBJR3Yckw91v26ijyGz5Pw,387
 dotflow/cli/commands/log.py,sha256=AJmDQM1ulbQg7_wZRsx3xac_7_6WlP8eA4pBWhpNBTo,590
 dotflow/cli/commands/schedule.py,sha256=C9wvgSowV4xgQqrx6pjNZk5-709uNDfsA7xGBjjbZYA,1442
-dotflow/cli/commands/start.py,sha256=kvnJIme_NJdK80GUXKZhxteEqpQS9V_WB-v_eFyR3q0,2075
+dotflow/cli/commands/start.py,sha256=52CkRDs8Y__beTBoKcHOofFRvy14Em8oO554iow-d7Y,3119
 dotflow/cli/commands/storage.py,sha256=b3CMBSFGEqYxaI9gwiO90MIirnW82CcM3GUf4XJGVYs,1549
-dotflow/cli/setup.py,sha256=baCsFM8jHoWYsQtYnq0t8NkLg8ScvV_ihmSEofuPfHo,7708
+dotflow/cli/setup.py,sha256=MDt_yNOdyDIhQHQfrWjXCvvnO5i0Ul-fwa7Dag2F6h0,8094
 dotflow/cli/validators/__init__.py,sha256=JKD-C4igDghgLjU2eBbpHkThUapoJ2mJRtC_YkeEvHg,121
 dotflow/cli/validators/start.py,sha256=ziQQWpLds6K_XnkiZt3m8bSs3KPdDSQzIuEiea5slks,466
 dotflow/cloud/__init__.py,sha256=N8XuL0M9P2vbP3WssHI85J8TSofVHo5llOI8EXp9RU0,21
@@ -68,8 +68,8 @@ dotflow/core/context.py,sha256=X72lG-ISBHIhS03X_FalG0THdgcLpiWrJEsyH2u-g3Q,2893
 dotflow/core/decorators/__init__.py,sha256=xPQMuZWV8TnIAH8uTF-Be9NoG46K7OmfJx_7GSWO_bc,101
 dotflow/core/decorators/time.py,sha256=46mI6Q8EZYkxU5DRnPJ5B8KgDBdR1bKivEm0u4pqwAg,300
 dotflow/core/dotflow.py,sha256=1dj854Q9GwIyznkU6P5nmNInPCFA7F_lcHswKScEj-E,2609
-dotflow/core/engine.py,sha256=4J8ZmM8vymhc0q6m1e65PPM4t23eDEGXLFgnQDHhxv4,9218
-dotflow/core/exception.py,sha256=wxNLcDE3n2HjRsSioNo86Fd9V4K7oZZDL-FD0mcZxDg,2242
+dotflow/core/engine.py,sha256=lSb_txhk8PwswtaE2kCCoI8qw8rS1Nvpw5QOkYGvo-c,9250
+dotflow/core/exception.py,sha256=e_IrsKNrRI3hBDgHgrnx7R3jVwsFP7wXUT8QRFxjbew,2800
 dotflow/core/module.py,sha256=5-19cKMa-BW3TVD1XVxiB_mPLTaeTIHfvVAvkkK3lmU,760
 dotflow/core/serializers/__init__.py,sha256=2b2vyCuXmvS8N_K-ePuCrWC9yvMqLPBMeORjAWS5U70,35
 dotflow/core/serializers/task.py,sha256=zpiXyQGzKsdA3dGUysFFlNdmGBsyqk-w0C5Uj4ubex0,4668
@@ -96,7 +96,7 @@ dotflow/providers/notify_discord.py,sha256=9cOt3YwJzuZzpNQlMLdc3sfJ5hfFRBBAmpNoU
 dotflow/providers/notify_telegram.py,sha256=xiyeqVSo_xQg3FR3_Q6Dnx2Qk8Sih2J7tkIVxkFSefk,3230
 dotflow/providers/scheduler_cron.py,sha256=wRXI5g0fDrYkBgD5zAMa5T8xxjU9v1SjDNpmsQD8nwA,8245
 dotflow/providers/scheduler_default.py,sha256=mkgMz5D6mROTDDY5juGXV4IgEDRPM0yW8_NJWDVfRTQ,258
-dotflow/providers/server_api.py,sha256=VNFfWly8EVNo7PSoVBF1hQJIwb1cPtULv34v3KHeu0U,2515
+dotflow/providers/server_api.py,sha256=l-p16HhatF4sAo-GwDUUPijmVcGNNM6wlF8u-T0a1iA,2570
 dotflow/providers/server_default.py,sha256=RRJMwN2oyyS_gHPif2fPJRGNsmTw2e3BmXVuQMYSR2M,500
 dotflow/providers/storage_default.py,sha256=ijE6cN0TlmTn8J5TiNvq_xakoK3JmciqI7qJWxesEBM,568
 dotflow/providers/storage_file.py,sha256=N4BPiDWWDOUbh5suzWvYzX6ZUtjhrfdZgSqwBPDW__I,2154
@@ -111,8 +111,8 @@ dotflow/utils/__init__.py,sha256=AXiUm5p-FVG9SBWPxdG6jV0ft49EK6c40ME4aznPWQc,366
 dotflow/utils/basic_functions.py,sha256=S-maghYauG5QkMtHdm7qNcxBkKkSoE4akHSiI178Bwg,131
 dotflow/utils/error_handler.py,sha256=I8DY2AKR-WxKl8k7aUJPExS6wlzKVPy_u42ZJ9gYyts,272
 dotflow/utils/tools.py,sha256=RtC0D1SnaNCB02cT-l0Dw8Wl6uDSQSABoZH2kdD1PJQ,787
-dotflow-0.16.0.dev2.dist-info/METADATA,sha256=i6enVoDSnIaKacPBZnBEIgPatqWtSTysXE9Nal97FOM,40731
-dotflow-0.16.0.dev2.dist-info/WHEEL,sha256=Vz2fHgx6HFtSwhs8KvkHLqH5Ea4w1_rner5uNVGCeIE,88
-dotflow-0.16.0.dev2.dist-info/entry_points.txt,sha256=3AW0pYKZpaMW6WZmN3t71X0FuwxQdivmQwe47_6yBp4,45
-dotflow-0.16.0.dev2.dist-info/licenses/LICENSE,sha256=0h5VY_8dcAiTIGt0weGPV6cjxdPGB37Pjusxm_WAiPU,10766
-dotflow-0.16.0.dev2.dist-info/RECORD,,
+dotflow-0.16.0.dev3.dist-info/METADATA,sha256=tLDiblVbnabL3H4pmYnvz3A3ZlVavI9izO2-T-NBAxU,40731
+dotflow-0.16.0.dev3.dist-info/WHEEL,sha256=Vz2fHgx6HFtSwhs8KvkHLqH5Ea4w1_rner5uNVGCeIE,88
+dotflow-0.16.0.dev3.dist-info/entry_points.txt,sha256=3AW0pYKZpaMW6WZmN3t71X0FuwxQdivmQwe47_6yBp4,45
+dotflow-0.16.0.dev3.dist-info/licenses/LICENSE,sha256=0h5VY_8dcAiTIGt0weGPV6cjxdPGB37Pjusxm_WAiPU,10766
+dotflow-0.16.0.dev3.dist-info/RECORD,,