dotflow 0.16.0.dev1__tar.gz → 0.16.0.dev3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotflow
-Version: 0.16.0.dev1
+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
@@ -237,6 +237,7 @@ Requires-Dist: google-cloud-storage ; extra == "gcp"
 Requires-Dist: opentelemetry-api ; extra == "otel"
 Requires-Dist: opentelemetry-sdk ; extra == "otel"
 Requires-Dist: pydantic
+Requires-Dist: python-ulid (>=3.0)
 Requires-Dist: requests
 Requires-Dist: rich
 Requires-Dist: sentry-sdk ; extra == "sentry"

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

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

{dotflow-0.16.0.dev1 → dotflow-0.16.0.dev3}/dotflow/abc/server.py

@@ -3,17 +3,9 @@
 from abc import ABC, abstractmethod
 from typing import Any
 
-from dotflow.constants import INITIAL_TASK_ID
-
 
 class Server(ABC):
-    """Server ABC provider for sending workflow and task
-    data to a remote API.
-
-    Implementations should handle HTTP communication with
-    a server like dotflow-api, sending execution data
-    (status, duration, errors, context) in real time.
-    """
+    """Server ABC provider for sending workflow/task data remotely."""
 
     @abstractmethod
     def create_workflow(self, workflow: Any) -> None:
@@ -30,7 +22,3 @@ class Server(ABC):
     @abstractmethod
     def update_task(self, task: Any) -> None:
         """Update task data on the remote server."""
-
-    def get_next_task_id(self, workflow: Any) -> int:
-        """Return the next task id to use inside an existing workflow."""
-        return INITIAL_TASK_ID

{dotflow-0.16.0.dev1 → 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.dev1 → 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.dev1 → dotflow-0.16.0.dev3}/dotflow/core/context.py

@@ -37,7 +37,7 @@ class Context(ContextInstance):
     Args:
         storage (Any): Attribute where any type of Python object can be stored.
 
-        task_id (int): Task ID.
+        task_id (str): Task ID (ULID).
 
         workflow_id (UUID): Workflow ID.
     """
@@ -45,7 +45,7 @@ class Context(ContextInstance):
     def __init__(
         self,
         storage: Any = None,
-        task_id: int = 0,
+        task_id: str = "",
         workflow_id: UUID = None,
     ) -> None:
         super().__init__(task_id, storage, task_id, workflow_id)
@@ -67,13 +67,13 @@ class Context(ContextInstance):
         return self._task_id
 
     @task_id.setter
-    def task_id(self, value: int):
+    def task_id(self, value: str):
         if value is None:
             self._task_id = None
             return
-        if not isinstance(value, int):
+        if not isinstance(value, str):
             raise TypeError(
-                f"task_id must be an int, got {type(value).__name__}: {value!r}"
+                f"task_id must be a str, got {type(value).__name__}: {value!r}"
             )
         self._task_id = value
 

{dotflow-0.16.0.dev1 → dotflow-0.16.0.dev3}/dotflow/core/dotflow.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from functools import partial
 from uuid import uuid4
 
-from dotflow.constants import INITIAL_TASK_ID
 from dotflow.core.config import Config
 from dotflow.core.task import TaskBuilder
 from dotflow.core.workflow import Manager
@@ -55,16 +54,10 @@ class DotFlow:
 
         if not self._externally_provided_id:
             self._config.server.create_workflow(workflow=self.workflow_id)
-            initial_task_id = INITIAL_TASK_ID
-        else:
-            initial_task_id = self._config.server.get_next_task_id(
-                workflow=self.workflow_id
-            )
 
         self.task = TaskBuilder(
             config=self._config,
             workflow_id=self.workflow_id,
-            initial_task_id=initial_task_id,
         )
 
         self.start = partial(

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

@@ -15,6 +15,8 @@ from time import sleep
 from types import FunctionType
 from uuid import UUID
 
+from ulid import ULID
+
 try:
     from types import NoneType
 except ImportError:
@@ -253,15 +255,16 @@ class TaskEngine:
             callable_list=callable_list, class_instance=class_instance
         )
 
-        for index, new in enumerate(ordered_list):
+        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 = index
+                subcontext.task_id = task_ulid
                 new_context.storage.append(subcontext)
                 previous_context = subcontext
 
@@ -275,7 +278,7 @@ class TaskEngine:
                     previous_context=previous_context,
                     task=self.task,
                 )
-                subcontext.task_id = index
+                subcontext.task_id = task_ulid
                 new_context.storage.append(subcontext)
                 previous_context = subcontext
 

{dotflow-0.16.0.dev1 → 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.dev1 → dotflow-0.16.0.dev3}/dotflow/core/serializers/task.py

@@ -28,7 +28,7 @@ class SerializerTaskError(BaseModel):
 class SerializerTask(BaseModel):
     model_config = ConfigDict(title="task")
 
-    task_id: int = Field(default=None)
+    task_id: str = Field(default=None)
     workflow_id: Optional[UUID] = Field(default=None)
     status: str = Field(default=None, alias="_status")
     duration: Optional[float] = Field(default=None, alias="_duration")

{dotflow-0.16.0.dev1 → dotflow-0.16.0.dev3}/dotflow/core/task.py

@@ -6,7 +6,8 @@ from datetime import datetime
 from typing import Any
 from uuid import UUID
 
-from dotflow.constants import INITIAL_TASK_ID
+from ulid import ULID
+
 from dotflow.core.action import Action
 from dotflow.core.config import Config
 from dotflow.core.context import Context
@@ -57,13 +58,13 @@ class Task(TaskInstance):
         `class` dotflow.core.task.Task
 
             task = Task(
-                task_id=1,
+                task_id="01ARZ3NDEKTSV4RRFFQ69G5FAV",
                 step=my_step,
                 callback=my_callback
             )
 
     Args:
-        task_id (int): Task ID.
+        task_id (str): Task ID (ULID).
 
         step (Callable):
             A argument that receives an object of the callable type,
@@ -86,7 +87,7 @@ class Task(TaskInstance):
 
     def __init__(
         self,
-        task_id: int,
+        task_id: str,
         step: Callable,
         callback: Callable = basic_callback,
         initial_context: Any = None,
@@ -309,12 +310,10 @@ class TaskBuilder:
         self,
         config: Config,
         workflow_id: UUID = None,
-        initial_task_id: int = INITIAL_TASK_ID,
     ) -> None:
         self.queue: list[Callable] = []
         self.workflow_id = workflow_id
         self.config = config
-        self._next_id = initial_task_id
 
     def add(
         self,
@@ -354,8 +353,7 @@ class TaskBuilder:
                 )
             return self
 
-        task_id = self._next_id
-        self._next_id += 1
+        task_id = str(ULID())
 
         self.queue.append(
             Task(

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

@@ -5,11 +5,10 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from requests import get, patch, post
+from requests import patch, post
 from requests.exceptions import RequestException
 
 from dotflow.abc.server import Server
-from dotflow.constants import INITIAL_TASK_ID
 
 logger = logging.getLogger(__name__)
 
@@ -80,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}"
@@ -87,19 +87,3 @@ class ServerAPI(Server):
             ),
             json=data,
         )
-
-    def get_next_task_id(self, workflow: Any) -> int:
-        url = f"{self._base_url}/workflows/{workflow}/tasks/next-id"
-        try:
-            response = get(
-                url,
-                headers=self._headers,
-                timeout=self._timeout,
-            )
-            logger.info("GET %s [%s]", url, response.status_code)
-            if response.status_code == 200:
-                return int(response.json().get("next_id", INITIAL_TASK_ID))
-        except (RequestException, ValueError, TypeError) as error:
-            logger.error("GET %s failed: %s", url, error)
-
-        return INITIAL_TASK_ID

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

@@ -1,6 +1,6 @@
 [project]
 name = "dotflow"
-version = "0.16.0.dev1"
+version = "0.16.0.dev3"
 authors = [
   { name="Fernando Celmer", email="email@fernandocelmer.com" },
 ]
@@ -13,7 +13,8 @@ dependencies = [
   "pydantic",
   "typing-extensions",
   "cookiecutter (>=2.0)",
-  "requests"
+  "requests",
+  "python-ulid (>=3.0)"
 ]
 keywords = [
   "pipeline",
@@ -66,7 +67,7 @@ sentry = ["sentry-sdk"]
 
 [tool.poetry]
 name = "dotflow"
-version = "0.16.0.dev1"
+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"
@@ -117,6 +118,7 @@ typing-extensions = "^4.14.1"
 python-dotenv = "^1.1.0"
 requests = "^2.32.4"
 cookiecutter = "^2.0"
+python-ulid = "^3.0.0"
 
 [tool.poetry.group.dev.dependencies]
 build = "^1.2.2.post1"

dotflow-0.16.0.dev1/dotflow/constants.py

@@ -1,3 +0,0 @@
-"""Project-wide constants."""
-
-INITIAL_TASK_ID: int = 1