ddeutil-workflow 0.0.57__py3-none-any.whl → 0.0.59__py3-none-any.whl

ddeutil/workflow/reusables.py

@@ -7,6 +7,7 @@
 """Reusables module that keep any templating functions."""
 from __future__ import annotations
 
+import copy
 import inspect
 import logging
 from ast import Call, Constant, Expr, Module, Name, parse
@@ -35,7 +36,7 @@ logger = logging.getLogger("ddeutil.workflow")
 logging.getLogger("asyncio").setLevel(logging.INFO)
 
 
-FILTERS: dict[str, callable] = {  # pragma: no cov
+FILTERS: dict[str, Callable] = {  # pragma: no cov
     "abs": abs,
     "str": str,
     "int": int,
@@ -258,9 +259,9 @@ def str2template(
     value: str,
     params: DictData,
     *,
-    filters: dict[str, FilterRegistry] | None = None,
+    filters: Optional[dict[str, FilterRegistry]] = None,
     registers: Optional[list[str]] = None,
-) -> str:
+) -> Optional[str]:
     """(Sub-function) Pass param to template string that can search by
     ``RE_CALLER`` regular expression.
 
@@ -326,7 +327,7 @@ def str2template(
 def param2template(
     value: T,
     params: DictData,
-    filters: dict[str, FilterRegistry] | None = None,
+    filters: Optional[dict[str, FilterRegistry]] = None,
     *,
     extras: Optional[DictData] = None,
 ) -> T:
@@ -381,7 +382,7 @@ def datetime_format(value: datetime, fmt: str = "%Y-%m-%d %H:%M:%S") -> str:
 
 
 @custom_filter("coalesce")  # pragma: no cov
-def coalesce(value: T | None, default: Any) -> T:
+def coalesce(value: Optional[T], default: Any) -> T:
     """Coalesce with default value if the main value is None."""
     return default if value is None else value
 
@@ -450,11 +451,10 @@ def make_registry(
     :rtype: dict[str, Registry]
     """
     rs: dict[str, Registry] = {}
-    regis_calls: list[str] = dynamic(
-        "registry_caller", f=registries
-    )  # pragma: no cov
+    regis_calls: list[str] = copy.deepcopy(
+        dynamic("registry_caller", f=registries)
+    )
     regis_calls.extend(["ddeutil.vendors"])
-
     for module in regis_calls:
         # NOTE: try to sequential import task functions
         try:

ddeutil/workflow/scheduler.py

@@ -57,7 +57,7 @@ except ImportError:  # pragma: no cov
 from .__cron import CronRunner
 from .__types import DictData, TupleStr
 from .conf import FileLoad, Loader, dynamic
-from .event import On
+from .event import Crontab
 from .exceptions import ScheduleException, WorkflowException
 from .logs import Audit, get_audit
 from .result import SUCCESS, Result
@@ -103,9 +103,9 @@ class ScheduleWorkflow(BaseModel):
         description="An alias name of workflow that use for schedule model.",
     )
     name: str = Field(description="A workflow name.")
-    on: list[On] = Field(
+    on: list[Crontab] = Field(
         default_factory=list,
-        description="An override the list of On object values.",
+        description="An override the list of Crontab object values.",
     )
     values: DictData = Field(
         default_factory=dict,
@@ -158,15 +158,17 @@ class ScheduleWorkflow(BaseModel):
         return data
 
     @field_validator("on", mode="after")
-    def __on_no_dup__(cls, value: list[On], info: ValidationInfo) -> list[On]:
+    def __on_no_dup__(
+        cls, value: list[Crontab], info: ValidationInfo
+    ) -> list[Crontab]:
         """Validate the on fields should not contain duplicate values and if it
         contains every minute value, it should have only one on value.
 
-        :param value: (list[On]) A list of `On` object.
+        :param value: (list[Crontab]) A list of `Crontab` object.
         :param info: (ValidationInfo) An validation info object for getting an
             extra parameter.
 
-        :rtype: list[On]
+        :rtype: list[Crontab]
         """
         set_ons: set[str] = {str(on.cronjob) for on in value}
         if len(set_ons) != len(value):
@@ -209,7 +211,7 @@ class ScheduleWorkflow(BaseModel):
 
         # IMPORTANT: Create the default 'on' value if it does not pass the `on`
         #   field to the Schedule object.
-        ons: list[On] = self.on or wf.on.copy()
+        ons: list[Crontab] = self.on or wf.on.copy()
         workflow_tasks: list[WorkflowTask] = []
         for on in ons:
 
@@ -333,9 +335,9 @@ class Schedule(BaseModel):
     def pending(
         self,
         *,
-        stop: datetime | None = None,
+        stop: Optional[datetime] = None,
         audit: type[Audit] | None = None,
-        parent_run_id: str | None = None,
+        parent_run_id: Optional[str] = None,
     ) -> Result:  # pragma: no cov
         """Pending this schedule tasks with the schedule package.
 
@@ -382,7 +384,7 @@ DecoratorCancelJob = Callable[[ReturnResultOrCancel], ReturnResultOrCancel]
 
 def catch_exceptions(
     cancel_on_failure: bool = False,
-    parent_run_id: str | None = None,
+    parent_run_id: Optional[str] = None,
 ) -> DecoratorCancelJob:
     """Catch exception error from scheduler job that running with schedule
     package and return CancelJob if this function raise an error.
@@ -438,7 +440,7 @@ def schedule_task(
     threads: ReleaseThreads,
     audit: type[Audit],
     *,
-    parent_run_id: str | None = None,
+    parent_run_id: Optional[str] = None,
     extras: Optional[DictData] = None,
 ) -> ResultOrCancel:
     """Schedule task function that generate thread of workflow task release
@@ -556,7 +558,7 @@ def schedule_task(
 
 def monitor(
     threads: ReleaseThreads,
-    parent_run_id: str | None = None,
+    parent_run_id: Optional[str] = None,
 ) -> None:  # pragma: no cov
     """Monitoring function that running every five minute for track long-running
     thread instance from the schedule_control function that run every minute.
@@ -683,11 +685,11 @@ def scheduler_pending(
 
 def schedule_control(
     schedules: list[str],
-    stop: datetime | None = None,
+    stop: Optional[datetime] = None,
     *,
     extras: DictData | None = None,
     audit: type[Audit] | None = None,
-    parent_run_id: str | None = None,
+    parent_run_id: Optional[str] = None,
 ) -> Result:  # pragma: no cov
     """Scheduler control function that run the chuck of schedules every minute
     and this function release monitoring thread for tracking undead thread in
@@ -742,7 +744,7 @@ def schedule_control(
 
 
 def schedule_runner(
-    stop: datetime | None = None,
+    stop: Optional[datetime] = None,
     *,
     max_process: int | None = None,
     extras: DictData | None = None,