ddeutil-workflow 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

ddeutil/workflow/__about__.py

@@ -1 +1 @@
-__version__: str = "0.0.22"
+__version__: str = "0.0.23"

ddeutil/workflow/__init__.py

@@ -24,9 +24,17 @@ from .on import (
     YearOn,
     interval2crontab,
 )
+from .params import (
+    ChoiceParam,
+    DatetimeParam,
+    IntParam,
+    Param,
+    StrParam,
+)
+from .result import Result
 from .scheduler import (
     Schedule,
-    ScheduleWorkflow,
+    WorkflowSchedule,
 )
 from .stage import (
     BashStage,
@@ -39,16 +47,9 @@ from .stage import (
 )
 from .utils import (
     FILTERS,
-    ChoiceParam,
-    DatetimeParam,
-    DefaultParam,
     FilterFunc,
     FilterRegistry,
-    IntParam,
-    Param,
-    Result,
     ReturnTagFunc,
-    StrParam,
     TagFunc,
     batch,
     cross_product,

ddeutil/workflow/api.py

@@ -23,7 +23,7 @@ from pydantic import BaseModel
 from .__about__ import __version__
 from .conf import config, get_logger
 from .repeat import repeat_at, repeat_every
-from .scheduler import WorkflowTaskData
+from .workflow import WorkflowTaskData
 
 load_dotenv()
 logger = get_logger("ddeutil.workflow")

ddeutil/workflow/job.py

@@ -36,9 +36,9 @@ from .exceptions import (
     StageException,
     UtilException,
 )
+from .result import Result
 from .stage import Stage
 from .utils import (
-    Result,
     cross_product,
     cut_id,
     dash2underscore,
@@ -313,7 +313,7 @@ class Job(BaseModel):
         # VALIDATE: Validate stage id should not duplicate.
         rs: list[str] = []
         for stage in value:
-            name: str = stage.id or stage.name
+            name: str = stage.iden
             if name in rs:
                 raise ValueError(
                     "Stage name in jobs object should not be duplicate."

ddeutil/workflow/on.py

@@ -61,7 +61,7 @@ def interval2crontab(
 
 
 class On(BaseModel):
-    """On Model (Schedule)
+    """On Pydantic model (Warped crontab object by model).
 
     See Also:
         * ``generate()`` is the main usecase of this schedule object.
@@ -197,8 +197,8 @@ class On(BaseModel):
 
 
 class YearOn(On):
-    """Implement On Year Schedule Model for limit year matrix that use by some
-    data schedule tools like AWS Glue.
+    """On with enhance Year Pydantic model for limit year matrix that use by
+    some data schedule tools like AWS Glue.
     """
 
     model_config = ConfigDict(arbitrary_types_allowed=True)

ddeutil/workflow/params.py

@@ -0,0 +1,176 @@
+# ------------------------------------------------------------------------------
+# Copyright (c) 2022 Korawich Anuttra. All rights reserved.
+# Licensed under the MIT License. See LICENSE in the project root for
+# license information.
+# ------------------------------------------------------------------------------
+from __future__ import annotations
+
+import logging
+from abc import ABC, abstractmethod
+from datetime import date, datetime
+from typing import Any, Literal, Optional, Union
+
+from pydantic import BaseModel, Field
+
+from .__types import TupleStr
+from .exceptions import ParamValueException
+from .utils import get_dt_now
+
+logger = logging.getLogger("ddeutil.workflow")
+
+__all__: TupleStr = (
+    "ChoiceParam",
+    "DatetimeParam",
+    "IntParam",
+    "Param",
+    "StrParam",
+)
+
+
+class BaseParam(BaseModel, ABC):
+    """Base Parameter that use to make any Params Model. The type will dynamic
+    with the type field that made from literal string."""
+
+    desc: Optional[str] = Field(
+        default=None, description="A description of parameter providing."
+    )
+    required: bool = Field(
+        default=True,
+        description="A require flag that force to pass this parameter value.",
+    )
+    type: str = Field(description="A type of parameter.")
+
+    @abstractmethod
+    def receive(self, value: Optional[Any] = None) -> Any:
+        raise NotImplementedError(
+            "Receive value and validate typing before return valid value."
+        )
+
+
+class DefaultParam(BaseParam):
+    """Default Parameter that will check default if it required. This model do
+    not implement the receive method.
+    """
+
+    required: bool = Field(
+        default=False,
+        description="A require flag for the default-able parameter value.",
+    )
+    default: Optional[str] = Field(
+        default=None,
+        description="A default value if parameter does not pass.",
+    )
+
+    @abstractmethod
+    def receive(self, value: Optional[Any] = None) -> Any:
+        raise NotImplementedError(
+            "Receive value and validate typing before return valid value."
+        )
+
+
+class DatetimeParam(DefaultParam):
+    """Datetime parameter."""
+
+    type: Literal["datetime"] = "datetime"
+    default: datetime = Field(default_factory=get_dt_now)
+
+    def receive(self, value: str | datetime | date | None = None) -> datetime:
+        """Receive value that match with datetime. If a input value pass with
+        None, it will use default value instead.
+
+        :param value: A value that want to validate with datetime parameter
+            type.
+        :rtype: datetime
+        """
+        if value is None:
+            return self.default
+
+        if isinstance(value, datetime):
+            return value
+        elif isinstance(value, date):
+            return datetime(value.year, value.month, value.day)
+        elif not isinstance(value, str):
+            raise ParamValueException(
+                f"Value that want to convert to datetime does not support for "
+                f"type: {type(value)}"
+            )
+        try:
+            return datetime.fromisoformat(value)
+        except ValueError:
+            raise ParamValueException(
+                f"Invalid isoformat string: {value!r}"
+            ) from None
+
+
+class StrParam(DefaultParam):
+    """String parameter."""
+
+    type: Literal["str"] = "str"
+
+    def receive(self, value: str | None = None) -> str | None:
+        """Receive value that match with str.
+
+        :param value: A value that want to validate with string parameter type.
+        :rtype: str | None
+        """
+        if value is None:
+            return self.default
+        return str(value)
+
+
+class IntParam(DefaultParam):
+    """Integer parameter."""
+
+    type: Literal["int"] = "int"
+    default: Optional[int] = Field(
+        default=None,
+        description="A default value if parameter does not pass.",
+    )
+
+    def receive(self, value: int | None = None) -> int | None:
+        """Receive value that match with int.
+
+        :param value: A value that want to validate with integer parameter type.
+        :rtype: int | None
+        """
+        if value is None:
+            return self.default
+        if not isinstance(value, int):
+            try:
+                return int(str(value))
+            except ValueError as err:
+                raise ParamValueException(
+                    f"Value can not convert to int, {value}, with base 10"
+                ) from err
+        return value
+
+
+class ChoiceParam(BaseParam):
+    """Choice parameter."""
+
+    type: Literal["choice"] = "choice"
+    options: list[str] = Field(description="A list of choice parameters.")
+
+    def receive(self, value: str | None = None) -> str:
+        """Receive value that match with options.
+
+        :param value: A value that want to select from the options field.
+        :rtype: str
+        """
+        # NOTE:
+        #   Return the first value in options if does not pass any input value
+        if value is None:
+            return self.options[0]
+        if value not in self.options:
+            raise ParamValueException(
+                f"{value!r} does not match any value in choice options."
+            )
+        return value
+
+
+Param = Union[
+    ChoiceParam,
+    DatetimeParam,
+    IntParam,
+    StrParam,
+]

ddeutil/workflow/result.py

@@ -0,0 +1,102 @@
+# ------------------------------------------------------------------------------
+# Copyright (c) 2022 Korawich Anuttra. All rights reserved.
+# Licensed under the MIT License. See LICENSE in the project root for
+# license information.
+# ------------------------------------------------------------------------------
+from __future__ import annotations
+
+from dataclasses import field
+from typing import Optional
+
+from pydantic.dataclasses import dataclass
+from pydantic.functional_validators import model_validator
+from typing_extensions import Self
+
+from .__types import DictData, TupleStr
+from .utils import gen_id
+
+__all__: TupleStr = ("Result",)
+
+
+@dataclass
+class Result:
+    """Result Pydantic Model for passing and receiving data context from any
+    module execution process like stage execution, job execution, or workflow
+    execution.
+
+        For comparison property, this result will use ``status``, ``context``,
+    and ``_run_id`` fields to comparing with other result instance.
+    """
+
+    status: int = field(default=2)
+    context: DictData = field(default_factory=dict)
+    run_id: Optional[str] = field(default=None)
+
+    # NOTE: Ignore this field to compare another result model with __eq__.
+    parent_run_id: Optional[str] = field(default=None, compare=False)
+
+    @model_validator(mode="after")
+    def __prepare_run_id(self) -> Self:
+        """Prepare running ID which use default ID if it initialize at the first
+        time
+
+        :rtype: Self
+        """
+        self._run_id = gen_id("manual", unique=True)
+        return self
+
+    def set_run_id(self, running_id: str) -> Self:
+        """Set a running ID.
+
+        :param running_id: A running ID that want to update on this model.
+        :rtype: Self
+        """
+        self.run_id = running_id
+        return self
+
+    def set_parent_run_id(self, running_id: str) -> Self:
+        """Set a parent running ID.
+
+        :param running_id: A running ID that want to update on this model.
+        :rtype: Self
+        """
+        self.parent_run_id: str = running_id
+        return self
+
+    def catch(self, status: int, context: DictData) -> Self:
+        """Catch the status and context to current data."""
+        self.__dict__["status"] = status
+        self.__dict__["context"].update(context)
+        return self
+
+    def receive(self, result: Result) -> Self:
+        """Receive context from another result object.
+
+        :rtype: Self
+        """
+        self.__dict__["status"] = result.status
+        self.__dict__["context"].update(result.context)
+
+        # NOTE: Update running ID from an incoming result.
+        self.parent_run_id = result.parent_run_id
+        self.run_id = result.run_id
+        return self
+
+    def receive_jobs(self, result: Result) -> Self:
+        """Receive context from another result object that use on the workflow
+        execution which create a ``jobs`` keys on the context if it do not
+        exist.
+
+        :rtype: Self
+        """
+        self.__dict__["status"] = result.status
+
+        # NOTE: Check the context has jobs key.
+        if "jobs" not in self.__dict__["context"]:
+            self.__dict__["context"]["jobs"] = {}
+        self.__dict__["context"]["jobs"].update(result.context)
+
+        # NOTE: Update running ID from an incoming result.
+        self.parent_run_id: str = result.parent_run_id
+        self.run_id: str = result.run_id
+        return self

ddeutil/workflow/route.py

@@ -17,8 +17,8 @@ from pydantic import BaseModel
 from . import Workflow
 from .__types import DictData
 from .conf import Loader, config, get_logger
+from .result import Result
 from .scheduler import Schedule
-from .utils import Result
 
 logger = get_logger("ddeutil.workflow")
 workflow = APIRouter(

ddeutil/workflow/scheduler.py

@@ -70,7 +70,7 @@ logging.getLogger("schedule").setLevel(logging.INFO)
 
 __all__: TupleStr = (
     "Schedule",
-    "ScheduleWorkflow",
+    "WorkflowSchedule",
     "workflow_task_release",
     "workflow_monitor",
     "workflow_control",
@@ -78,25 +78,29 @@ __all__: TupleStr = (
 )
 
 
-class ScheduleWorkflow(BaseModel):
-    """Schedule Workflow Pydantic model that use to keep workflow model for the
-    Schedule model. it should not use Workflow model directly because on the
+class WorkflowSchedule(BaseModel):
+    """Workflow Schedule Pydantic model that use to keep workflow model for
+    the Schedule model. it should not use Workflow model directly because on the
     schedule config it can adjust crontab value that different from the Workflow
     model.
     """
 
     alias: Optional[str] = Field(
         default=None,
-        description="An alias name of workflow.",
+        description="An alias name of workflow that use for schedule model.",
     )
     name: str = Field(description="A workflow name.")
     on: list[On] = Field(
         default_factory=list,
-        description="An override On instance value.",
+        description="An override the list of On object values.",
     )
-    params: DictData = Field(
+    values: DictData = Field(
         default_factory=dict,
-        description="A parameters that want to use in workflow execution.",
+        description=(
+            "A value that want to pass to the workflow parameters when "
+            "calling release method."
+        ),
+        alias="params",
     )
 
     @model_validator(mode="before")
@@ -105,10 +109,13 @@ class ScheduleWorkflow(BaseModel):
 
         :rtype: DictData
         """
-        values["name"] = values["name"].replace(" ", "_")
+        # VALIDATE: Prepare a workflow name that should not include space.
+        if name := values.get("name"):
+            values["name"] = name.replace(" ", "_")
 
+        # VALIDATE: Add default the alias field with the name.
         if not values.get("alias"):
-            values["alias"] = values["name"]
+            values["alias"] = values.get("name")
 
         cls.__bypass_on(values)
         return values
@@ -135,6 +142,7 @@ class ScheduleWorkflow(BaseModel):
                 Loader(n, externals={}).data if isinstance(n, str) else n
                 for n in on
             ]
+
         return data
 
     @field_validator("on", mode="after")
@@ -150,19 +158,20 @@ class ScheduleWorkflow(BaseModel):
                 "The on fields should not contain duplicate on value."
             )
 
-        # WARNING:
-        # if '* * * * *' in set_ons and len(set_ons) > 1:
-        #     raise ValueError(
-        #         "If it has every minute cronjob on value, it should has only "
-        #         "one value in the on field."
-        #     )
+        if len(set_ons) > config.max_on_per_workflow:
+            raise ValueError(
+                f"The number of the on should not more than "
+                f"{config.max_on_per_workflow} crontab."
+            )
+
         return value
 
 
 class Schedule(BaseModel):
-    """Schedule Pydantic Model that use to run with scheduler package. It does
-    not equal the on value in Workflow model but it use same logic to running
-    release date with crontab interval.
+    """Schedule Pydantic model that use to run with any scheduler package.
+
+        It does not equal the on value in Workflow model but it use same logic
+    to running release date with crontab interval.
     """
 
     desc: Optional[str] = Field(
@@ -171,9 +180,9 @@ class Schedule(BaseModel):
             "A schedule description that can be string of markdown content."
         ),
     )
-    workflows: list[ScheduleWorkflow] = Field(
+    workflows: list[WorkflowSchedule] = Field(
         default_factory=list,
-        description="A list of ScheduleWorkflow models.",
+        description="A list of WorkflowSchedule models.",
     )
 
     @field_validator("desc", mode="after")
@@ -181,6 +190,7 @@ class Schedule(BaseModel):
         """Prepare description string that was created on a template.
 
         :param value: A description string value that want to dedent.
+
         :rtype: str
         """
         return dedent(value)
@@ -224,6 +234,9 @@ class Schedule(BaseModel):
         """Return the list of WorkflowTaskData object from the specific input
         datetime that mapping with the on field.
 
+            This task creation need queue to tracking release date already
+        mapped or not.
+
         :param start_date: A start date that get from the workflow schedule.
         :param queue: A mapping of name and list of datetime for queue.
         :param externals: An external parameters that pass to the Loader object.
@@ -232,22 +245,21 @@ class Schedule(BaseModel):
         :return: Return the list of WorkflowTaskData object from the specific
             input datetime that mapping with the on field.
         """
-
-        # NOTE: Create pair of workflow and on.
         workflow_tasks: list[WorkflowTaskData] = []
         extras: DictData = externals or {}
 
         for sch_wf in self.workflows:
 
+            # NOTE: Loading workflow model from the name of workflow.
             wf: Workflow = Workflow.from_loader(sch_wf.name, externals=extras)
 
-            # NOTE: Create default list of release datetime.
+            # NOTE: Create default list of release datetime by empty list.
             if sch_wf.alias not in queue:
                 queue[sch_wf.alias]: list[datetime] = []
 
             # IMPORTANT: Create the default 'on' value if it does not passing
             #   the on field to the Schedule object.
-            ons: list[On] = wf.on.copy() if len(sch_wf.on) == 0 else sch_wf.on
+            ons: list[On] = sch_wf.on or wf.on.copy()
 
             for on in ons:
 
@@ -263,7 +275,7 @@ class Schedule(BaseModel):
                         alias=sch_wf.alias,
                         workflow=wf,
                         runner=runner,
-                        params=sch_wf.params,
+                        params=sch_wf.values,
                     ),
                 )
 

ddeutil/workflow/stage.py

@@ -51,9 +51,9 @@ from typing_extensions import Self
 from .__types import DictData, DictStr, Re, TupleStr
 from .conf import config, get_logger
 from .exceptions import StageException
+from .result import Result
 from .utils import (
     Registry,
-    Result,
     TagFunc,
     cut_id,
     gen_id,

ddeutil/workflow/utils.py

@@ -9,11 +9,9 @@ import inspect
 import logging
 import stat
 import time
-from abc import ABC, abstractmethod
 from ast import Call, Constant, Expr, Module, Name, parse
 from collections.abc import Iterator
-from dataclasses import field
-from datetime import date, datetime, timedelta
+from datetime import datetime, timedelta
 from functools import wraps
 from hashlib import md5
 from importlib import import_module
@@ -21,7 +19,7 @@ from inspect import isfunction
 from itertools import chain, islice, product
 from pathlib import Path
 from random import randrange
-from typing import Any, Callable, Literal, Optional, Protocol, TypeVar, Union
+from typing import Any, Callable, Protocol, TypeVar, Union
 from zoneinfo import ZoneInfo
 
 try:
@@ -31,14 +29,11 @@ except ImportError:
 
 from ddeutil.core import getdot, hasdot, hash_str, import_string, lazy
 from ddeutil.io import search_env_replace
-from pydantic import BaseModel, Field
-from pydantic.dataclasses import dataclass
-from pydantic.functional_validators import model_validator
-from typing_extensions import Self
+from pydantic import BaseModel
 
 from .__types import DictData, Matrix, Re
 from .conf import config
-from .exceptions import ParamValueException, UtilException
+from .exceptions import UtilException
 
 T = TypeVar("T")
 P = ParamSpec("P")
@@ -198,238 +193,6 @@ def make_registry(submodule: str) -> dict[str, Registry]:
     return rs
 
 
-class BaseParam(BaseModel, ABC):
-    """Base Parameter that use to make Params Model."""
-
-    desc: Optional[str] = Field(
-        default=None, description="A description of parameter providing."
-    )
-    required: bool = Field(
-        default=True,
-        description="A require flag that force to pass this parameter value.",
-    )
-    type: str = Field(description="A type of parameter.")
-
-    @abstractmethod
-    def receive(self, value: Optional[Any] = None) -> Any:
-        raise NotImplementedError(
-            "Receive value and validate typing before return valid value."
-        )
-
-
-class DefaultParam(BaseParam):
-    """Default Parameter that will check default if it required. This model do
-    not implement the receive method.
-    """
-
-    required: bool = Field(
-        default=False,
-        description="A require flag for the default-able parameter value.",
-    )
-    default: Optional[str] = Field(
-        default=None,
-        description="A default value if parameter does not pass.",
-    )
-
-    @abstractmethod
-    def receive(self, value: Optional[Any] = None) -> Any:
-        raise NotImplementedError(
-            "Receive value and validate typing before return valid value."
-        )
-
-
-class DatetimeParam(DefaultParam):
-    """Datetime parameter."""
-
-    type: Literal["datetime"] = "datetime"
-    default: datetime = Field(default_factory=get_dt_now)
-
-    def receive(self, value: str | datetime | date | None = None) -> datetime:
-        """Receive value that match with datetime. If a input value pass with
-        None, it will use default value instead.
-
-        :param value: A value that want to validate with datetime parameter
-            type.
-        :rtype: datetime
-        """
-        if value is None:
-            return self.default
-
-        if isinstance(value, datetime):
-            return value
-        elif isinstance(value, date):
-            return datetime(value.year, value.month, value.day)
-        elif not isinstance(value, str):
-            raise ParamValueException(
-                f"Value that want to convert to datetime does not support for "
-                f"type: {type(value)}"
-            )
-        try:
-            return datetime.fromisoformat(value)
-        except ValueError:
-            raise ParamValueException(
-                f"Invalid isoformat string: {value!r}"
-            ) from None
-
-
-class StrParam(DefaultParam):
-    """String parameter."""
-
-    type: Literal["str"] = "str"
-
-    def receive(self, value: str | None = None) -> str | None:
-        """Receive value that match with str.
-
-        :param value: A value that want to validate with string parameter type.
-        :rtype: str | None
-        """
-        if value is None:
-            return self.default
-        return str(value)
-
-
-class IntParam(DefaultParam):
-    """Integer parameter."""
-
-    type: Literal["int"] = "int"
-    default: Optional[int] = Field(
-        default=None,
-        description="A default value if parameter does not pass.",
-    )
-
-    def receive(self, value: int | None = None) -> int | None:
-        """Receive value that match with int.
-
-        :param value: A value that want to validate with integer parameter type.
-        :rtype: int | None
-        """
-        if value is None:
-            return self.default
-        if not isinstance(value, int):
-            try:
-                return int(str(value))
-            except ValueError as err:
-                raise ParamValueException(
-                    f"Value can not convert to int, {value}, with base 10"
-                ) from err
-        return value
-
-
-class ChoiceParam(BaseParam):
-    """Choice parameter."""
-
-    type: Literal["choice"] = "choice"
-    options: list[str] = Field(description="A list of choice parameters.")
-
-    def receive(self, value: str | None = None) -> str:
-        """Receive value that match with options.
-
-        :param value: A value that want to select from the options field.
-        :rtype: str
-        """
-        # NOTE:
-        #   Return the first value in options if does not pass any input value
-        if value is None:
-            return self.options[0]
-        if value not in self.options:
-            raise ParamValueException(
-                f"{value!r} does not match any value in choice options."
-            )
-        return value
-
-
-Param = Union[
-    ChoiceParam,
-    DatetimeParam,
-    IntParam,
-    StrParam,
-]
-
-
-@dataclass
-class Result:
-    """Result Pydantic Model for passing and receiving data context from any
-    module execution process like stage execution, job execution, or workflow
-    execution.
-
-        For comparison property, this result will use ``status``, ``context``,
-    and ``_run_id`` fields to comparing with other result instance.
-    """
-
-    status: int = field(default=2)
-    context: DictData = field(default_factory=dict)
-
-    # NOTE: Ignore this field to compare another result model with __eq__.
-    run_id: Optional[str] = field(default=None)
-    parent_run_id: Optional[str] = field(default=None, compare=False)
-
-    @model_validator(mode="after")
-    def __prepare_run_id(self) -> Self:
-        """Prepare running ID which use default ID if it initialize at the first
-        time
-
-        :rtype: Self
-        """
-        self._run_id = gen_id("manual", unique=True)
-        return self
-
-    def set_run_id(self, running_id: str) -> Self:
-        """Set a running ID.
-
-        :param running_id: A running ID that want to update on this model.
-        :rtype: Self
-        """
-        self.run_id = running_id
-        return self
-
-    def set_parent_run_id(self, running_id: str) -> Self:
-        """Set a parent running ID.
-
-        :param running_id: A running ID that want to update on this model.
-        :rtype: Self
-        """
-        self.parent_run_id: str = running_id
-        return self
-
-    def catch(self, status: int, context: DictData) -> Self:
-        """Catch the status and context to current data."""
-        self.__dict__["status"] = status
-        self.__dict__["context"].update(context)
-        return self
-
-    def receive(self, result: Result) -> Self:
-        """Receive context from another result object.
-
-        :rtype: Self
-        """
-        self.__dict__["status"] = result.status
-        self.__dict__["context"].update(result.context)
-
-        # NOTE: Update running ID from an incoming result.
-        self.parent_run_id = result.parent_run_id
-        self.run_id = result.run_id
-        return self
-
-    def receive_jobs(self, result: Result) -> Self:
-        """Receive context from another result object that use on the workflow
-        execution which create a ``jobs`` keys on the context if it do not
-        exist.
-
-        :rtype: Self
-        """
-        self.__dict__["status"] = result.status
-
-        # NOTE: Check the context has jobs key.
-        if "jobs" not in self.__dict__["context"]:
-            self.__dict__["context"]["jobs"] = {}
-        self.__dict__["context"]["jobs"].update(result.context)
-
-        # NOTE: Update running ID from an incoming result.
-        self.parent_run_id: str = result.parent_run_id
-        self.run_id: str = result.run_id
-        return self
-
-
 def make_exec(path: str | Path) -> None:
     """Change mode of file to be executable file.
 

ddeutil/workflow/workflow.py

@@ -33,7 +33,7 @@ from functools import total_ordering
 from heapq import heappop, heappush
 from queue import Queue
 from textwrap import dedent
-from typing import Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic.dataclasses import dataclass
@@ -46,9 +46,9 @@ from .conf import FileLog, Loader, Log, config, get_logger
 from .exceptions import JobException, WorkflowException
 from .job import Job
 from .on import On
+from .params import Param
+from .result import Result
 from .utils import (
-    Param,
-    Result,
     cut_id,
     delay,
     gen_id,
@@ -86,13 +86,16 @@ class WorkflowRelease:
         return f"{self.date:%Y-%m-%d %H:%M:%S}"
 
     @classmethod
-    def from_dt(cls, dt: datetime) -> Self:
+    def from_dt(cls, dt: datetime | str) -> Self:
         """Construct WorkflowRelease via datetime object only.
 
         :param dt: A datetime object.
 
         :rtype: Self
         """
+        if isinstance(dt, str):
+            dt: datetime = datetime.fromisoformat(dt)
+
         return cls(
             date=dt,
             offset=0,
@@ -132,7 +135,7 @@ class WorkflowQueue:
 
     @classmethod
     def from_list(
-        cls, queue: list[datetime] | list[WorkflowRelease] | None
+        cls, queue: list[datetime] | list[WorkflowRelease] | None = None
     ) -> Self:
         """Construct WorkflowQueue object from an input queue value that passing
         with list of datetime or list of WorkflowRelease.
@@ -143,12 +146,13 @@ class WorkflowQueue:
         """
         if queue is None:
             return cls()
-        elif isinstance(queue, list):
+
+        if isinstance(queue, list):
 
             if all(isinstance(q, datetime) for q in queue):
                 return cls(queue=[WorkflowRelease.from_dt(q) for q in queue])
 
-            elif all(isinstance(q, WorkflowRelease) for q in queue):
+            if all(isinstance(q, WorkflowRelease) for q in queue):
                 return cls(queue=queue)
 
         raise TypeError(
@@ -518,12 +522,15 @@ class Workflow(BaseModel):
         queue.remove_running(release)
         heappush(queue.complete, release)
 
+        context: dict[str, Any] = rs.context
+        context.pop("params")
+
         return rs_release.catch(
             status=0,
             context={
                 "params": params,
                 "release": {"status": "success", "logical_date": release.date},
-                "outputs": rs.context,
+                "outputs": context,
             },
         )
 
@@ -654,9 +661,10 @@ class Workflow(BaseModel):
         )
 
         params: DictData = {} if params is None else params
-        wf_queue: WorkflowQueue = WorkflowQueue()
         results: list[Result] = []
-        futures: list[Future] = []
+
+        # NOTE: Create empty WorkflowQueue object.
+        wf_queue: WorkflowQueue = WorkflowQueue()
 
         # NOTE: Make queue to the workflow queue object.
         self.queue_poking(
@@ -680,6 +688,8 @@ class Workflow(BaseModel):
             thread_name_prefix="wf_poking_",
         ) as executor:
 
+            futures: list[Future] = []
+
             while wf_queue.is_queued:
 
                 # NOTE: Pop the latest WorkflowRelease object from queue.
@@ -1017,7 +1027,7 @@ class Workflow(BaseModel):
         not_timeout_flag: bool = True
         timeout: int = timeout or config.max_job_exec_timeout
         logger.debug(
-            f"({cut_id(run_id)}) [WORKFLOW]: Run {self.name} with "
+            f"({cut_id(run_id)}) [WORKFLOW]: Run {self.name!r} with "
             f"non-threading."
         )
 
@@ -1075,7 +1085,7 @@ class WorkflowTaskData:
     alias: str
     workflow: Workflow
     runner: CronRunner
-    params: DictData
+    params: DictData = field(default_factory=dict)
 
     def release(
         self,
@@ -1085,20 +1095,24 @@ class WorkflowTaskData:
         *,
         waiting_sec: int = 60,
         sleep_interval: int = 15,
-    ) -> None:  # pragma: no cov
-        """Workflow task release that use the same logic of `workflow.release`
-        method.
+    ) -> Result:  # pragma: no cov
+        """Release the workflow task data that use the same logic of
+        `workflow.release` method but use different the queue object for
+        tracking release datetime to run.
 
-        :param queue:
+        :param queue: A mapping of alias name and list of release datetime.
         :param log: A log object for saving result logging from workflow
             execution process.
         :param run_id: A workflow running ID for this release.
         :param waiting_sec: A second period value that allow workflow execute.
         :param sleep_interval: A second value that want to waiting until time
             to execute.
+
+        :rtype: Result
         """
-        log: Log = log or FileLog
-        run_id: str = run_id or gen_id(self.workflow.name, unique=True)
+        log: type[Log] = log or FileLog
+        run_id: str = run_id or gen_id(self.alias, unique=True)
+        rs_release: Result = Result(run_id=run_id)
         runner: CronRunner = self.runner
 
         # NOTE: get next schedule time that generate from now.
@@ -1129,7 +1143,7 @@ class WorkflowTaskData:
             queue[self.alias].remove(next_time)
 
             time.sleep(0.2)
-            return
+            return rs_release.catch(status=0, context={})
 
         logger.debug(
             f"({cut_id(run_id)}) [CORE]: {self.workflow.name!r} : "
@@ -1153,6 +1167,9 @@ class WorkflowTaskData:
         release_params: DictData = {
             "release": {
                 "logical_date": next_time,
+                "execute_date": datetime.now(tz=config.tz),
+                "run_id": run_id,
+                "timezone": runner.tz,
             },
         }
 
@@ -1198,6 +1215,18 @@ class WorkflowTaskData:
         # NOTE: Queue next release date.
         logger.debug(f"[CORE]: {'-' * 100}")
 
+        context: dict[str, Any] = rs.context
+        context.pop("params")
+
+        return rs_release.catch(
+            status=0,
+            context={
+                "params": self.params,
+                "release": {"status": "success", "logical_date": next_time},
+                "outputs": context,
+            },
+        )
+
     def __eq__(self, other: WorkflowTaskData) -> bool:
         """Override equal property that will compare only the same type."""
         if isinstance(other, WorkflowTaskData):

{ddeutil_workflow-0.0.22.dist-info → ddeutil_workflow-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddeutil-workflow
-Version: 0.0.22
+Version: 0.0.23
 Summary: Lightweight workflow orchestration with less dependencies
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT

ddeutil_workflow-0.0.23.dist-info/RECORD

@@ -0,0 +1,24 @@
+ddeutil/workflow/__about__.py,sha256=xc6s739CYU9opnZq2_D6Mx3ekymsbYOQKM2zsgw85oc,28
+ddeutil/workflow/__cron.py,sha256=_2P9nmGOwGdv5bLgf9TpML2HBgqLv_qRgiO1Rulo1PA,26693
+ddeutil/workflow/__init__.py,sha256=dH3T06kO8aEiRHAiL-d8a3IvOS0Fx80lS3AWz6rGdQk,1443
+ddeutil/workflow/__types.py,sha256=Ia7f38kvL3NibwmRKi0wQ1ud_45Z-SojYGhNJwIqcu8,3713
+ddeutil/workflow/api.py,sha256=ceTJfjXIw-3cgw4yx2QCcGLuA3STb0o7ELcVR_tfZFI,4700
+ddeutil/workflow/cli.py,sha256=baHhvtI8snbHYHeThoX401Cd6SMB2boyyCbCtTrIl3E,3278
+ddeutil/workflow/conf.py,sha256=GsbuJDQfQoAGiR4keUEoB4lKfZxdkaiZ4N4FfIHc0xY,15814
+ddeutil/workflow/exceptions.py,sha256=NqnQJP52S59XIYMeXbTDbr4xH2UZ5EA3ejpU5Z4g6cQ,894
+ddeutil/workflow/job.py,sha256=cvSLMdc1sMl1MeU7so7Oe2SdRYxQwt6hm55mLV1iP-Y,24219
+ddeutil/workflow/on.py,sha256=0SxC3SH-8V1idgAEFOY-gYFEQPjK_zymmc5XqPoX_0I,7504
+ddeutil/workflow/params.py,sha256=uPGkZx18E-iZ8BteqQ2ONgg0frhF3ZmP5cOyfK2j59U,5280
+ddeutil/workflow/repeat.py,sha256=s0azh-f5JQeow7kpxM8GKlqgAmKL7oU6St3L4Ggx4cY,4925
+ddeutil/workflow/result.py,sha256=WIC8MsnfLiWNpZomT6jS4YCdYhlbIVVBjtGGe2dkoKk,3404
+ddeutil/workflow/route.py,sha256=bH5IT90JVjCDe9A0gIefpQQBEfcd-o1uCHE9AvNglvU,6754
+ddeutil/workflow/scheduler.py,sha256=MYHf1bz8nsT8tJYcXgC-UycWbJ56Hx_zXwUAwWICimM,19141
+ddeutil/workflow/stage.py,sha256=y6gjNzQy7xAM0n-lwqAEoC4x0lopH0K-Y77a_gvq4t8,26505
+ddeutil/workflow/utils.py,sha256=ZVQh5vArWHNfCFYWYjHvkVD5aH-350ycfcZxDewELHM,18578
+ddeutil/workflow/workflow.py,sha256=jmJxAEkczuanmj041OLgeBUDz9Y8XfFNVP_B3Xi7QDY,42557
+ddeutil_workflow-0.0.23.dist-info/LICENSE,sha256=nGFZ1QEhhhWeMHf9n99_fdt4vQaXS29xWKxt-OcLywk,1085
+ddeutil_workflow-0.0.23.dist-info/METADATA,sha256=4KqKSGCbc8dWHwWSCSgU4m_wsOouFHsiCGtdyo0Mf5U,14017
+ddeutil_workflow-0.0.23.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ddeutil_workflow-0.0.23.dist-info/entry_points.txt,sha256=0BVOgO3LdUdXVZ-CiHHDKxzEk2c8J30jEwHeKn2YCWI,62
+ddeutil_workflow-0.0.23.dist-info/top_level.txt,sha256=m9M6XeSWDwt_yMsmH6gcOjHZVK5O0-vgtNBuncHjzW4,8
+ddeutil_workflow-0.0.23.dist-info/RECORD,,

ddeutil_workflow-0.0.22.dist-info/RECORD

@@ -1,22 +0,0 @@
-ddeutil/workflow/__about__.py,sha256=hJavfsPLTnuXMwKFo9HZgsq6b7tJpWgyfttwaxzMujE,28
-ddeutil/workflow/__cron.py,sha256=_2P9nmGOwGdv5bLgf9TpML2HBgqLv_qRgiO1Rulo1PA,26693
-ddeutil/workflow/__init__.py,sha256=DCSN0foPFlFLN_Q4uoWa_EBBlKeMHXGpOdr-lWHISrQ,1422
-ddeutil/workflow/__types.py,sha256=Ia7f38kvL3NibwmRKi0wQ1ud_45Z-SojYGhNJwIqcu8,3713
-ddeutil/workflow/api.py,sha256=vUT2RVS9sF3hvY-IrzAEnahxwq4ZFYP0G3xfctHbNsw,4701
-ddeutil/workflow/cli.py,sha256=baHhvtI8snbHYHeThoX401Cd6SMB2boyyCbCtTrIl3E,3278
-ddeutil/workflow/conf.py,sha256=GsbuJDQfQoAGiR4keUEoB4lKfZxdkaiZ4N4FfIHc0xY,15814
-ddeutil/workflow/exceptions.py,sha256=NqnQJP52S59XIYMeXbTDbr4xH2UZ5EA3ejpU5Z4g6cQ,894
-ddeutil/workflow/job.py,sha256=liu8M_pUhAGHZ_Ez922jI94LCC3yioI-Tw5o71Zy88w,24216
-ddeutil/workflow/on.py,sha256=wxKfL2u-bBhPbDtZbhqE2lZoPVukHA1zq-qrg0ldic0,7469
-ddeutil/workflow/repeat.py,sha256=s0azh-f5JQeow7kpxM8GKlqgAmKL7oU6St3L4Ggx4cY,4925
-ddeutil/workflow/route.py,sha256=JALwOH6xKu5rnII7DgA1Lbp_E5ehCoBbOW_eKqB_Olk,6753
-ddeutil/workflow/scheduler.py,sha256=B2uXsqzmp32nIbya8EDePYyRhpwcxCMeoibPABCuMOA,18750
-ddeutil/workflow/stage.py,sha256=ADFqExFmD8Y00A86TSS05HpabvsLV7_dbLrzD31TkK8,26490
-ddeutil/workflow/utils.py,sha256=0GaHpRL1HuyES1NS7r56DFgloOVftYVAvAdVgIbPA_k,26001
-ddeutil/workflow/workflow.py,sha256=fzhKJx9s-RF95FQ0tAvAQ1nsL8dsp_py2Ea5TGnjsOk,41542
-ddeutil_workflow-0.0.22.dist-info/LICENSE,sha256=nGFZ1QEhhhWeMHf9n99_fdt4vQaXS29xWKxt-OcLywk,1085
-ddeutil_workflow-0.0.22.dist-info/METADATA,sha256=J_VrfU8ZBPAa7OrhMV_c4sLbQ0g3Nc0MQSdYUgmxF6I,14017
-ddeutil_workflow-0.0.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ddeutil_workflow-0.0.22.dist-info/entry_points.txt,sha256=0BVOgO3LdUdXVZ-CiHHDKxzEk2c8J30jEwHeKn2YCWI,62
-ddeutil_workflow-0.0.22.dist-info/top_level.txt,sha256=m9M6XeSWDwt_yMsmH6gcOjHZVK5O0-vgtNBuncHjzW4,8
-ddeutil_workflow-0.0.22.dist-info/RECORD,,