ddeutil-workflow 0.0.17__tar.gz → 0.0.18__tar.gz

{ddeutil_workflow-0.0.17/src/ddeutil_workflow.egg-info → ddeutil_workflow-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddeutil-workflow
-Version: 0.0.17
+Version: 0.0.18
 Summary: Lightweight workflow orchestration with less dependencies
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -24,6 +24,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ddeutil>=0.4.3
 Requires-Dist: ddeutil-io[toml,yaml]>=0.2.3
+Requires-Dist: pydantic==2.9.2
 Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: typer<1.0.0,==0.12.5
 Requires-Dist: schedule<2.0.0,==1.2.2
@@ -194,7 +195,7 @@ and do not raise any error to you.
 | `WORKFLOW_CORE_JOB_RAISE_ERROR`         | Core      | true                             | A flag that all job raise JobException from job strategy execution.                                                |        |
 | `WORKFLOW_CORE_MAX_NUM_POKING`          | Core      | 4                                | .                                                                                                                  |        |
 | `WORKFLOW_CORE_MAX_JOB_PARALLEL`        | Core      | 2                                | The maximum job number that able to run parallel in workflow executor.                                             |        |
-| `WORKFLOW_CORE_WORKFLOW_ID_SIMPLE_MODE` | Core      | true                             | .                                                                                                                  |        |
+| `WORKFLOW_CORE_GENERATE_ID_SIMPLE_MODE` | Core      | true                             | A flog that enable generating ID with `md5` algorithm.                                                             |        |
 | `WORKFLOW_LOG_DEBUG_MODE`               | Log       | true                             | A flag that enable logging with debug level mode.                                                                  |        |
 | `WORKFLOW_LOG_ENABLE_WRITE`             | Log       | true                             | A flag that enable logging object saving log to its destination.                                                   |        |
 | `WORKFLOW_APP_MAX_PROCESS`              | Schedule  | 2                                | The maximum process worker number that run in scheduler app module.                                                |        |

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/README.md

@@ -162,7 +162,7 @@ and do not raise any error to you.
 | `WORKFLOW_CORE_JOB_RAISE_ERROR`         | Core      | true                             | A flag that all job raise JobException from job strategy execution.                                                |        |
 | `WORKFLOW_CORE_MAX_NUM_POKING`          | Core      | 4                                | .                                                                                                                  |        |
 | `WORKFLOW_CORE_MAX_JOB_PARALLEL`        | Core      | 2                                | The maximum job number that able to run parallel in workflow executor.                                             |        |
-| `WORKFLOW_CORE_WORKFLOW_ID_SIMPLE_MODE` | Core      | true                             | .                                                                                                                  |        |
+| `WORKFLOW_CORE_GENERATE_ID_SIMPLE_MODE` | Core      | true                             | A flog that enable generating ID with `md5` algorithm.                                                             |        |
 | `WORKFLOW_LOG_DEBUG_MODE`               | Log       | true                             | A flag that enable logging with debug level mode.                                                                  |        |
 | `WORKFLOW_LOG_ENABLE_WRITE`             | Log       | true                             | A flag that enable logging object saving log to its destination.                                                   |        |
 | `WORKFLOW_APP_MAX_PROCESS`              | Schedule  | 2                                | The maximum process worker number that run in scheduler app module.                                                |        |

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/pyproject.toml

@@ -28,6 +28,7 @@ requires-python = ">=3.9.13"
 dependencies = [
     "ddeutil>=0.4.3",
     "ddeutil-io[yaml,toml]>=0.2.3",
+    "pydantic==2.9.2",
     "python-dotenv==1.0.1",
     "typer==0.12.5,<1.0.0",
     "schedule==1.2.2,<2.0.0",

ddeutil_workflow-0.0.18/src/ddeutil/workflow/__about__.py

@@ -0,0 +1 @@
+__version__: str = "0.0.18"

ddeutil_workflow-0.0.18/src/ddeutil/workflow/__init__.py

@@ -0,0 +1,72 @@
+# ------------------------------------------------------------------------------
+# Copyright (c) 2022 Korawich Anuttra. All rights reserved.
+# Licensed under the MIT License. See LICENSE in the project root for
+# license information.
+# ------------------------------------------------------------------------------
+from .conf import (
+    Config,
+    FileLog,
+    Loader,
+)
+from .exceptions import (
+    JobException,
+    ParamValueException,
+    StageException,
+    UtilException,
+    WorkflowException,
+)
+from .job import Job, Strategy
+from .on import (
+    On,
+    YearOn,
+    interval2crontab,
+)
+from .scheduler import (
+    Schedule,
+    ScheduleWorkflow,
+    Workflow,
+    WorkflowTaskData,
+)
+from .stage import (
+    BashStage,
+    EmptyStage,
+    HookStage,
+    PyStage,
+    Stage,
+    TriggerStage,
+    handler_result,
+)
+from .utils import (
+    FILTERS,
+    ChoiceParam,
+    DatetimeParam,
+    DefaultParam,
+    FilterFunc,
+    FilterRegistry,
+    IntParam,
+    Param,
+    Result,
+    ReturnTagFunc,
+    StrParam,
+    TagFunc,
+    batch,
+    cross_product,
+    custom_filter,
+    dash2underscore,
+    delay,
+    filter_func,
+    gen_id,
+    get_args_const,
+    get_diff_sec,
+    get_dt_now,
+    has_template,
+    make_exec,
+    make_filter_registry,
+    make_registry,
+    map_post_filter,
+    not_in_template,
+    param2template,
+    queue2str,
+    str2template,
+    tag,
+)

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/conf.py

@@ -41,8 +41,8 @@ class Config:
     # NOTE: Core
     root_path: Path = Path(os.getenv("WORKFLOW_ROOT_PATH", "."))
     tz: ZoneInfo = ZoneInfo(env("WORKFLOW_CORE_TIMEZONE", "UTC"))
-    workflow_id_simple_mode: bool = str2bool(
-        os.getenv("WORKFLOW_CORE_WORKFLOW_ID_SIMPLE_MODE", "true")
+    gen_id_simple_mode: bool = str2bool(
+        os.getenv("WORKFLOW_CORE_GENERATE_ID_SIMPLE_MODE", "true")
     )
 
     # NOTE: Register

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/job.py

@@ -553,8 +553,6 @@ class Job(BaseModel):
         # NOTE: Create event for cancel executor by trigger stop running event.
         event: Event = Event()
 
-        print("Job Run Fail-Fast:", self.strategy.fail_fast)
-
         # IMPORTANT: Start running strategy execution by multithreading because
         #   it will running by strategy values without waiting previous
         #   execution.

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/repeat.py

@@ -12,8 +12,8 @@ from functools import wraps
 
 from starlette.concurrency import run_in_threadpool
 
+from .__cron import CronJob
 from .conf import config, get_logger
-from .cron import CronJob
 
 logger = get_logger("ddeutil.workflow")
 

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/scheduler.py

@@ -376,7 +376,7 @@ class Workflow(BaseModel):
                 status=0,
                 context={
                     "params": params,
-                    "poking": {"skipped": [str(on.cronjob)], "run": []},
+                    "release": {"status": "skipped", "cron": [str(on.cronjob)]},
                 },
             )
 
@@ -388,7 +388,7 @@ class Workflow(BaseModel):
         # NOTE: Release when the time is nearly to schedule time.
         while (duration := get_diff_sec(next_time, tz=cron_tz)) > (
             sleep_interval + 5
-        ):
+        ):  # pragma: no cov
             logger.debug(
                 f"({self.run_id}) [CORE]: {self.name!r} : {on.cronjob} : "
                 f"Sleep until: {duration}"
@@ -439,7 +439,7 @@ class Workflow(BaseModel):
             status=0,
             context={
                 "params": params,
-                "poking": {"skipped": [], "run": [str(on.cronjob)]},
+                "release": {"status": "run", "cron": [str(on.cronjob)]},
             },
         )
 
@@ -492,7 +492,7 @@ class Workflow(BaseModel):
             for future in as_completed(futures):
                 results.append(future.result(timeout=60))
 
-        if len(queue) > 0:
+        if len(queue) > 0:  # pragma: no cov
             logger.error(
                 f"({self.run_id}) [POKING]: Log Queue does empty when poking "
                 f"process was finishing."
@@ -717,11 +717,11 @@ class Workflow(BaseModel):
             return context
 
         # NOTE: Raise timeout error.
-        logger.warning(
+        logger.warning(  # pragma: no cov
             f"({self.run_id}) [WORKFLOW]: Execution of workflow, {self.name!r} "
             f", was timeout"
         )
-        raise WorkflowException(
+        raise WorkflowException(  # pragma: no cov
             f"Execution of workflow: {self.name} was timeout"
         )
 
@@ -765,7 +765,8 @@ class Workflow(BaseModel):
                 continue
 
             # NOTE: Start workflow job execution with deep copy context data
-            #   before release.
+            #   before release. This job execution process will running until
+            #   done before checking all execution timeout or not.
             #
             #   {
             #       'params': <input-params>,
@@ -783,10 +784,10 @@ class Workflow(BaseModel):
             return context
 
         # NOTE: Raise timeout error.
-        logger.warning(
+        logger.warning(  # pragma: no cov
             f"({self.run_id}) [WORKFLOW]: Execution of workflow was timeout"
         )
-        raise WorkflowException(
+        raise WorkflowException(  # pragma: no cov
             f"Execution of workflow: {self.name} was timeout"
         )
 
@@ -832,12 +833,13 @@ class ScheduleWorkflow(BaseModel):
         if on := data.pop("on", []):
 
             if isinstance(on, str):
-                on = [on]
+                on: list[str] = [on]
 
             if any(not isinstance(n, (dict, str)) for n in on):
                 raise TypeError("The ``on`` key should be list of str or dict")
 
-            # NOTE: Pass on value to Loader and keep on model object to on field
+            # NOTE: Pass on value to Loader and keep on model object to on
+            #   field.
             data["on"] = [
                 (
                     Loader(n, externals=(externals or {})).data
@@ -902,12 +904,14 @@ class Schedule(BaseModel):
         *,
         externals: DictData | None = None,
     ) -> list[WorkflowTaskData]:
-        """Generate Task from the current datetime.
+        """Return the list of WorkflowTaskData object from the specific input
+        datetime that mapping with the on field.
 
         :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 running: A mapping of name and list of datetime for running.
         :param externals: An external parameters that pass to the Loader object.
+
         :rtype: list[WorkflowTaskData]
         """
 
@@ -922,12 +926,14 @@ class Schedule(BaseModel):
             queue[wfs.name]: list[datetime] = []
             running[wfs.name]: list[datetime] = []
 
-            # NOTE: Create default on if it does not passing on the Schedule.
+            # NOTE: Create the default on value if it does not passing on the
+            #   Schedule object.
             _ons: list[On] = wf.on.copy() if len(wfs.on) == 0 else wfs.on
 
             for on in _ons:
-                on_gen = on.generate(start_date)
+                on_gen: CronRunner = on.generate(start_date)
                 next_running_date = on_gen.next
+
                 while next_running_date in queue[wfs.name]:
                     next_running_date = on_gen.next
 
@@ -957,13 +963,14 @@ def catch_exceptions(cancel_on_failure: bool = False) -> DecoratorCancelJob:
 
     :param cancel_on_failure: A flag that allow to return the CancelJob or not
         it will raise.
-    :rtype: Callable[P, Optional[CancelJob]]
+
+    :rtype: DecoratorCancelJob
     """
 
     def decorator(func: ReturnCancelJob) -> ReturnCancelJob:
         try:
             # NOTE: Check the function that want to handle is method or not.
-            if inspect.ismethod(func):
+            if inspect.ismethod(func):  # pragma: no cov
 
                 @wraps(func)
                 def wrapper(self, *args, **kwargs):
@@ -977,7 +984,7 @@ def catch_exceptions(cancel_on_failure: bool = False) -> DecoratorCancelJob:
 
             return wrapper
 
-        except Exception as err:
+        except Exception as err:  # pragma: no cov
             logger.exception(err)
             if cancel_on_failure:
                 return CancelJob
@@ -1005,7 +1012,7 @@ class WorkflowTaskData:
         *,
         waiting_sec: int = 60,
         sleep_interval: int = 15,
-    ) -> None:
+    ) -> None:  # pragma: no cov
         """Workflow release, it will use with the same logic of
         `workflow.release` method.
 
@@ -1119,7 +1126,7 @@ class WorkflowTaskData:
             future_running_time in self.running[wf.name]
             or future_running_time in self.queue[wf.name]
             or future_running_time < finish_time
-        ):
+        ):  # pragma: no cov
             future_running_time: datetime = gen.next
 
         heappush(self.queue[wf.name], future_running_time)
@@ -1134,7 +1141,7 @@ class WorkflowTaskData:
         return NotImplemented
 
 
-@catch_exceptions(cancel_on_failure=True)
+@catch_exceptions(cancel_on_failure=True)  # pragma: no cov
 def workflow_task(
     workflow_tasks: list[WorkflowTaskData],
     stop: datetime,
@@ -1233,7 +1240,7 @@ def workflow_task(
     logger.debug(f"[WORKFLOW]: {'=' * 100}")
 
 
-def workflow_monitor(threads: dict[str, Thread]) -> None:
+def workflow_monitor(threads: dict[str, Thread]) -> None:  # pragma: no cov
     """Workflow schedule for monitoring long running thread from the schedule
     control.
 
@@ -1255,7 +1262,7 @@ def workflow_control(
     schedules: list[str],
     stop: datetime | None = None,
     externals: DictData | None = None,
-) -> list[str]:
+) -> list[str]:  # pragma: no cov
     """Workflow scheduler control.
 
     :param schedules: A list of workflow names that want to schedule running.
@@ -1343,7 +1350,7 @@ def workflow_runner(
     stop: datetime | None = None,
     externals: DictData | None = None,
     excluded: list[str] | None = None,
-) -> list[str]:
+) -> list[str]:  # pragma: no cov
     """Workflow application that running multiprocessing schedule with chunk of
     workflows that exists in config path.
 

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/stage.py

@@ -127,7 +127,6 @@ def handler_result(message: str | None = None) -> DecoratorResult:
                 logger.error(
                     f"({self.run_id}) [STAGE]: {err.__class__.__name__}: {err}"
                 )
-                print("Stage Raise error:", config.stage_raise_error)
                 if config.stage_raise_error:
                     # NOTE: If error that raise from stage execution course by
                     #   itself, it will return that error with previous

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil/workflow/utils.py

@@ -100,7 +100,7 @@ def gen_id(
     if not isinstance(value, str):
         value: str = str(value)
 
-    if config.workflow_id_simple_mode:
+    if config.gen_id_simple_mode:
         return hash_str(f"{(value if sensitive else value.lower())}", n=10) + (
             f"{datetime.now(tz=config.tz):%Y%m%d%H%M%S%f}" if unique else ""
         )

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18/src/ddeutil_workflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddeutil-workflow
-Version: 0.0.17
+Version: 0.0.18
 Summary: Lightweight workflow orchestration with less dependencies
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -24,6 +24,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ddeutil>=0.4.3
 Requires-Dist: ddeutil-io[toml,yaml]>=0.2.3
+Requires-Dist: pydantic==2.9.2
 Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: typer<1.0.0,==0.12.5
 Requires-Dist: schedule<2.0.0,==1.2.2
@@ -194,7 +195,7 @@ and do not raise any error to you.
 | `WORKFLOW_CORE_JOB_RAISE_ERROR`         | Core      | true                             | A flag that all job raise JobException from job strategy execution.                                                |        |
 | `WORKFLOW_CORE_MAX_NUM_POKING`          | Core      | 4                                | .                                                                                                                  |        |
 | `WORKFLOW_CORE_MAX_JOB_PARALLEL`        | Core      | 2                                | The maximum job number that able to run parallel in workflow executor.                                             |        |
-| `WORKFLOW_CORE_WORKFLOW_ID_SIMPLE_MODE` | Core      | true                             | .                                                                                                                  |        |
+| `WORKFLOW_CORE_GENERATE_ID_SIMPLE_MODE` | Core      | true                             | A flog that enable generating ID with `md5` algorithm.                                                             |        |
 | `WORKFLOW_LOG_DEBUG_MODE`               | Log       | true                             | A flag that enable logging with debug level mode.                                                                  |        |
 | `WORKFLOW_LOG_ENABLE_WRITE`             | Log       | true                             | A flag that enable logging object saving log to its destination.                                                   |        |
 | `WORKFLOW_APP_MAX_PROCESS`              | Schedule  | 2                                | The maximum process worker number that run in scheduler app module.                                                |        |

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil_workflow.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ tests/test_job_strategy_run.py
 tests/test_on.py
 tests/test_params.py
 tests/test_scheduler.py
+tests/test_scheduler_tasks.py
 tests/test_stage.py
 tests/test_stage_bash.py
 tests/test_stage_hook.py
@@ -47,6 +48,7 @@ tests/test_utils_tag.py
 tests/test_utils_template.py
 tests/test_workflow.py
 tests/test_workflow_depends.py
+tests/test_workflow_job_run.py
 tests/test_workflow_matrix.py
 tests/test_workflow_on.py
 tests/test_workflow_params.py

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/src/ddeutil_workflow.egg-info/requires.txt

@@ -1,5 +1,6 @@
 ddeutil>=0.4.3
 ddeutil-io[toml,yaml]>=0.2.3
+pydantic==2.9.2
 python-dotenv==1.0.1
 typer<1.0.0,==0.12.5
 schedule<2.0.0,==1.2.2

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/tests/test_conf_log.py

@@ -50,7 +50,22 @@ def test_conf_log_file_do_first():
     assert log.name == "wf-demo-logging"
 
 
+@mock.patch.object(Config, "enable_write_log", True)
 def test_conf_log_file_find_logs(root_path):
+    log = FileLog.model_validate(
+        obj={
+            "name": "wf-scheduling",
+            "on": "*/2 * * * *",
+            "release": datetime(2024, 1, 1, 1),
+            "context": {
+                "params": {"name": "foo"},
+            },
+            "parent_run_id": None,
+            "run_id": "558851633820240817184358131811",
+            "update": datetime.now(),
+        },
+    )
+    log.save(excluded=None)
     log = next(FileLog.find_logs(name="wf-scheduling"))
     assert isinstance(log, FileLog)
 

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/tests/test_scheduler.py

@@ -1,30 +1,80 @@
 from datetime import datetime
 
+import pytest
+import yaml
 from ddeutil.workflow import Workflow
 from ddeutil.workflow.conf import Loader
 from ddeutil.workflow.on import On
 from ddeutil.workflow.scheduler import Schedule, WorkflowTaskData
 
 
-def test_scheduler_model():
+def test_schedule():
     schedule = Schedule.from_loader("schedule-wf")
     print(schedule)
 
+    schedule = Schedule.from_loader("schedule-common-wf")
+    print(schedule)
+
+
+def test_schedule_from_loader_raise(test_path):
+    test_file = test_path / "conf/demo/03_schedule_raise.yml"
+
+    with test_file.open(mode="w") as f:
+        yaml.dump(
+            {
+                "schedule-raise-wf": {
+                    "type": "ddeutil.workflow.on.On",
+                    "workflows": [
+                        {"name": "wf-scheduling"},
+                    ],
+                }
+            },
+            f,
+        )
+
+    with pytest.raises(ValueError):
+        Schedule.from_loader("schedule-raise-wf")
 
-def test_scheduler_model_default_on():
+    with test_file.open(mode="w") as f:
+        yaml.dump(
+            {
+                "schedule-raise-wf": {
+                    "type": "scheduler.Schedule",
+                    "workflows": [
+                        {
+                            "name": "wf-scheduling",
+                            "on": [
+                                ["every_3_minute_bkk"],
+                                ["every_minute_bkk"],
+                            ],
+                        },
+                    ],
+                }
+            },
+            f,
+        )
+
+    with pytest.raises(TypeError):
+        Schedule.from_loader("schedule-raise-wf")
+
+    test_file.unlink(missing_ok=True)
+
+
+def test_schedule_model_default_on():
     schedule = Schedule.from_loader("schedule-default-wf")
     print(schedule)
 
 
-def test_scheduler_loader_find_schedule():
+def test_schedule_loader_find_schedule():
     for finding in Loader.finds(Schedule, excluded=[]):
         print(finding)
 
 
-def test_scheduler_remove_wf_task():
+def test_schedule_remove_workflow_task():
     queue: dict[str, list[datetime]] = {"wf-scheduling": []}
     running: dict[str, list[datetime]] = {"wf-scheduling": []}
     pipeline_tasks: list[WorkflowTaskData] = []
+
     wf: Workflow = Workflow.from_loader("wf-scheduling", externals={})
     for on in wf.on:
         pipeline_tasks.append(

ddeutil_workflow-0.0.18/tests/test_scheduler_tasks.py

@@ -0,0 +1,72 @@
+from datetime import datetime
+from unittest import mock
+from zoneinfo import ZoneInfo
+
+from ddeutil.workflow.conf import Config
+from ddeutil.workflow.scheduler import Schedule, WorkflowTaskData
+
+
+def test_schedule_tasks():
+    schedule = Schedule.from_loader("schedule-wf")
+
+    queue: dict[str, list[datetime]] = {"wf-scheduling": []}
+    running: dict[str, list[datetime]] = {"wf-scheduling": []}
+    for wf_task in schedule.tasks(
+        datetime(2024, 1, 1, 1),
+        queue=queue,
+        running=running,
+    ):
+        assert wf_task.workflow.name == "wf-scheduling"
+
+    task = schedule.tasks(
+        datetime(2024, 1, 1, 1),
+        queue=queue,
+        running=running,
+    )[0]
+
+    assert task != datetime(2024, 1, 1, 1)
+    assert task == task
+    assert task == WorkflowTaskData(
+        workflow=task.workflow,
+        on=task.on,
+        params={},
+        queue={},
+        running={},
+    )
+
+
+@mock.patch.object(Config, "enable_write_log", False)
+def test_schedule_tasks_release():
+    schedule = Schedule.from_loader("schedule-common-wf")
+
+    queue: dict[str, list[datetime]] = {"wf-scheduling": []}
+    running: dict[str, list[datetime]] = {"wf-scheduling": []}
+    for wf_task in schedule.tasks(
+        datetime(2024, 1, 1, 1, 2, 30),
+        queue=queue,
+        running=running,
+    ):
+        assert wf_task.workflow.name == "wf-scheduling"
+        wf_task.release(waiting_sec=60)
+
+
+@mock.patch.object(Config, "enable_write_log", False)
+def test_schedule_tasks_release_skip():
+    schedule = Schedule.from_loader("schedule-common-wf")
+
+    queue: dict[str, list[datetime]] = {"wf-scheduling": []}
+    running: dict[str, list[datetime]] = {"wf-scheduling": []}
+    for wf_task in schedule.tasks(
+        datetime(2024, 1, 1, 1),
+        queue=queue,
+        running=running,
+    ):
+        assert wf_task.workflow.name == "wf-scheduling"
+        wf_task.release(waiting_sec=0)
+
+    assert queue == {
+        "wf-scheduling": [
+            datetime(2024, 1, 1, 1, tzinfo=ZoneInfo("Asia/Bangkok")),
+        ]
+    }
+    assert running == {"wf-scheduling": []}

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/tests/test_utils.py

@@ -8,7 +8,7 @@ def test_gen_id():
     assert "1354680202" == utils.gen_id("{}")
     assert "1354680202" == utils.gen_id("{}", sensitive=False)
 
-    with patch("ddeutil.workflow.utils.config.workflow_id_simple_mode", False):
+    with patch("ddeutil.workflow.utils.config.gen_id_simple_mode", False):
         assert "99914b932bd37a50b983c5e7c90ae93b" == utils.gen_id("{}")
 
 

ddeutil_workflow-0.0.18/tests/test_workflow_job_run.py

@@ -0,0 +1,28 @@
+import pytest
+from ddeutil.workflow import Workflow
+from ddeutil.workflow.exceptions import WorkflowException
+from ddeutil.workflow.utils import Result
+
+
+def test_workflow_execute_job():
+    workflow = Workflow.from_loader(name="wf-run-python")
+    rs: Result = workflow.execute_job(
+        job_id="final-job",
+        params={
+            "author-run": "Local Workflow",
+            "run-date": "2024-01-01",
+        },
+    )
+    print(rs.context)
+
+
+def test_workflow_execute_job_raise():
+    workflow = Workflow.from_loader(name="wf-run-python")
+    with pytest.raises(WorkflowException):
+        workflow.execute_job(
+            job_id="not-found-job",
+            params={
+                "author-run": "Local Workflow",
+                "run-date": "2024-01-01",
+            },
+        )

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/tests/test_workflow_poke.py

@@ -1,4 +1,5 @@
 from ddeutil.workflow import Workflow
+from ddeutil.workflow.utils import Result
 
 
 def test_workflow_poke_no_on():
@@ -8,9 +9,12 @@ def test_workflow_poke_no_on():
 
 def test_workflow_poke():
     wf = Workflow.from_loader(name="wf-run-matrix-fail-fast", externals={})
-    results = wf.poke(params={"name": "FOO"})
+    results: list[Result] = wf.poke(params={"name": "FOO"})
     for rs in results:
-        print(rs.context["poking"])
+        assert "status" in rs.context["release"]
+        assert "cron" in rs.context["release"]
+
+    wf.poke(params={"name": "FOO"})
 
 
 def test_workflow_poke_with_release_params():

{ddeutil_workflow-0.0.17 → ddeutil_workflow-0.0.18}/tests/test_workflow_run.py

@@ -1,16 +1,13 @@
 from datetime import datetime
 from unittest import mock
 
-import ddeutil.workflow as wf
+from ddeutil.workflow import Workflow
 from ddeutil.workflow.conf import Config
 from ddeutil.workflow.utils import Result
 
 
 def test_workflow_run_py():
-    workflow = wf.Workflow.from_loader(
-        name="wf-run-python",
-        externals={},
-    )
+    workflow = Workflow.from_loader(name="wf-run-python")
     rs: Result = workflow.execute(
         params={
             "author-run": "Local Workflow",
@@ -68,7 +65,7 @@ def test_workflow_run_py():
 
 def test_workflow_run_py_with_parallel():
     with mock.patch.object(Config, "max_job_parallel", 3):
-        workflow = wf.Workflow.from_loader(
+        workflow = Workflow.from_loader(
             name="wf-run-python",
             externals={},
         )
@@ -128,11 +125,40 @@ def test_workflow_run_py_with_parallel():
 
 
 def test_workflow_run_py_raise():
-    workflow = wf.Workflow.from_loader("wf-run-python-raise", externals={})
+    workflow = Workflow.from_loader("wf-run-python-raise")
     rs = workflow.execute(params={})
-    print(rs)
-    assert 1 == rs.status
+    assert rs.status == 1
+    assert rs.context == {
+        "params": {},
+        "jobs": {},
+        "error": rs.context["error"],
+        "error_message": (
+            "WorkflowException: Get job execution error first-job: "
+            "JobException: Get stage execution error: "
+            "StageException: PyStage: \n\t"
+            "ValueError: Testing raise error inside PyStage!!!"
+        ),
+    }
 
-    import json
 
-    print(json.dumps(rs.context, indent=2, default=str))
+@mock.patch.object(Config, "max_job_parallel", 2)
+def test_workflow_run_py_raise_parallel():
+    workflow = Workflow.from_loader("wf-run-python-raise")
+    rs = workflow.execute(params={})
+    assert rs.status == 1
+    assert rs.context == {
+        "params": {},
+        "jobs": {
+            "second-job": {
+                "matrix": {},
+                "stages": {"1772094681": {"outputs": {}}},
+            }
+        },
+        "error": rs.context["error"],
+        "error_message": (
+            "WorkflowException: Get job execution error first-job: "
+            "JobException: Get stage execution error: "
+            "StageException: PyStage: \n\t"
+            "ValueError: Testing raise error inside PyStage!!!"
+        ),
+    }

ddeutil_workflow-0.0.17/src/ddeutil/workflow/__about__.py

@@ -1 +0,0 @@
-__version__: str = "0.0.17"

ddeutil_workflow-0.0.17/src/ddeutil/workflow/__init__.py

@@ -1,25 +0,0 @@
-# ------------------------------------------------------------------------------
-# Copyright (c) 2022 Korawich Anuttra. All rights reserved.
-# Licensed under the MIT License. See LICENSE in the project root for
-# license information.
-# ------------------------------------------------------------------------------
-from .conf import Config, FileLog, Loader
-from .exceptions import (
-    JobException,
-    ParamValueException,
-    StageException,
-    UtilException,
-    WorkflowException,
-)
-from .job import Job, Strategy
-from .on import On, interval2crontab
-from .scheduler import (
-    Schedule,
-    Workflow,
-)
-from .stage import Stage, handler_result
-from .utils import (
-    Param,
-    dash2underscore,
-    param2template,
-)