ddeutil-workflow 0.0.71__tar.gz → 0.0.73__tar.gz

{ddeutil_workflow-0.0.71/src/ddeutil_workflow.egg-info → ddeutil_workflow-0.0.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddeutil-workflow
-Version: 0.0.71
+Version: 0.0.73
 Summary: Lightweight workflow orchestration with YAML template
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -24,9 +24,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ddeutil[checksum]>=0.4.8
 Requires-Dist: ddeutil-io[toml,yaml]>=0.2.14
-Requires-Dist: pydantic==2.11.5
-Requires-Dist: pydantic-extra-types==2.10.4
-Requires-Dist: python-dotenv==1.1.0
+Requires-Dist: pydantic<3.0.0,==2.11.5
+Requires-Dist: pydantic-extra-types<3.0.0,>=2.10.4
+Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: typer>=0.16.0
 Provides-Extra: all
 Requires-Dist: fastapi<1.0.0,>=0.115.0; extra == "all"

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/pyproject.toml

@@ -27,9 +27,9 @@ requires-python = ">=3.9.13"
 dependencies = [
     "ddeutil[checksum]>=0.4.8",
     "ddeutil-io[yaml,toml]>=0.2.14",
-    "pydantic==2.11.5",
-    "pydantic-extra-types==2.10.4",
-    "python-dotenv==1.1.0",
+    "pydantic==2.11.5,<3.0.0",
+    "pydantic-extra-types>=2.10.4,<3.0.0",
+    "python-dotenv>=1.1.0",
     "typer>=0.16.0",
 ]
 dynamic = ["version"]
@@ -116,7 +116,7 @@ filterwarnings = [
 ]
 log_cli = true
 log_cli_level = "DEBUG"
-log_cli_format = "%(asctime)s [%(levelname)-7s] %(message)-120s (%(filename)s:%(lineno)s)"
+log_cli_format = "%(asctime)s [%(levelname)-7s] (%(cut_id)s) %(message)-120s (%(filename)s:%(lineno)s)"
 log_cli_date_format = "%Y%m%d %H:%M:%S"
 
 [tool.black]

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

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

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/cli.py

@@ -1,3 +1,10 @@
+# ------------------------------------------------------------------------------
+# 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 json
 from pathlib import Path
 from platform import python_version
@@ -8,7 +15,6 @@ from pydantic import Field, TypeAdapter
 
 from .__about__ import __version__
 from .__types import DictData
-from .api import app as fastapp
 from .errors import JobError
 from .event import Crontab
 from .job import Job
@@ -46,7 +52,7 @@ def execute_job(
     """Job execution on the local.
 
     Example:
-        ... workflow-cli job --params "{\"test\": 1}"
+        ... workflow-cli job --params \"{\\\"test\\\": 1}\"
     """
     try:
         params_dict: dict[str, Any] = json.loads(params)
@@ -92,6 +98,7 @@ def api(
     """
     import uvicorn
 
+    from .api import app as fastapp
     from .api.log_conf import LOGGING_CONFIG
 
     # LOGGING_CONFIG = {}
@@ -121,7 +128,7 @@ def make(
 
 
 workflow_app = typer.Typer()
-app.add_typer(workflow_app, name="workflow", help="An Only Workflow CLI.")
+app.add_typer(workflow_app, name="workflows", help="An Only Workflow CLI.")
 
 
 @workflow_app.callback()
@@ -180,5 +187,14 @@ def workflow_json_schema(
         json.dump(template_schema | json_schema, f, indent=2)
 
 
+log_app = typer.Typer()
+app.add_typer(log_app, name="logs", help="An Only Log CLI.")
+
+
+@log_app.callback()
+def log_callback():
+    """Manage Only Log CLI."""
+
+
 if __name__ == "__main__":
     app()

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/conf.py

@@ -9,7 +9,6 @@ import copy
 import os
 from collections.abc import Iterator
 from functools import cached_property
-from inspect import isclass
 from pathlib import Path
 from typing import Final, Optional, TypeVar, Union
 from zoneinfo import ZoneInfo
@@ -20,6 +19,7 @@ from ddeutil.io.paths import glob_files, is_ignored, read_ignore
 from pydantic import SecretStr
 
 from .__types import DictData
+from .utils import obj_name
 
 T = TypeVar("T")
 PREFIX: Final[str] = "WORKFLOW"
@@ -109,7 +109,7 @@ class Config:  # pragma: no cov
             "LOG_FORMAT",
             (
                 "%(asctime)s.%(msecs)03d (%(process)-5d, "
-                "%(thread)-5d) [%(levelname)-7s] %(message)-120s "
+                "%(thread)-5d) [%(levelname)-7s] (%(cut_id)s) %(message)-120s "
                 "(%(filename)s:%(lineno)s) (%(name)-10s)"
             ),
         )
@@ -119,8 +119,8 @@ class Config:  # pragma: no cov
         return env(
             "LOG_FORMAT_FILE",
             (
-                "{datetime} ({process:5d}, {thread:5d}) {message:120s} "
-                "({filename}:{lineno})"
+                "{datetime} ({process:5d}, {thread:5d}) ({cut_id}) "
+                "{message:120s} ({filename}:{lineno})"
             ),
         )
 
@@ -192,6 +192,7 @@ class YamlParser:
         path: Optional[Union[str, Path]] = None,
         externals: DictData | None = None,
         extras: DictData | None = None,
+        obj: Optional[Union[object, str]] = None,
     ) -> None:
         self.path: Path = Path(dynamic("conf_path", f=path, extras=extras))
         self.externals: DictData = externals or {}
@@ -201,6 +202,7 @@ class YamlParser:
             path=path,
             paths=self.extras.get("conf_paths"),
             extras=extras,
+            obj=obj,
         )
 
         # VALIDATE: check the data that reading should not empty.
@@ -218,7 +220,9 @@ class YamlParser:
         *,
         path: Optional[Path] = None,
         paths: Optional[list[Path]] = None,
+        obj: Optional[Union[object, str]] = None,
         extras: Optional[DictData] = None,
+        ignore_filename: Optional[str] = None,
     ) -> DictData:
         """Find data with specific key and return the latest modify date data if
         this key exists multiple files.
@@ -226,8 +230,12 @@ class YamlParser:
         :param name: (str) A name of data that want to find.
         :param path: (Path) A config path object.
         :param paths: (list[Path]) A list of config path object.
+        :param obj: (object | str) An object that want to validate matching
+            before return.
         :param extras: (DictData)  An extra parameter that use to override core
             config values.
+        :param ignore_filename: (str) An ignore filename. Default is
+            ``.confignore`` filename.
 
         :rtype: DictData
         """
@@ -243,39 +251,49 @@ class YamlParser:
             paths.append(path)
 
         all_data: list[tuple[float, DictData]] = []
+        obj_type: Optional[str] = obj_name(obj)
+
         for path in paths:
             for file in glob_files(path):
 
-                if cls.is_ignore(file, path):
+                if cls.is_ignore(file, path, ignore_filename=ignore_filename):
                     continue
 
                 if data := cls.filter_yaml(file, name=name):
-                    all_data.append((file.lstat().st_mtime, data))
+                    if not obj_type:
+                        all_data.append((file.lstat().st_mtime, data))
+                    elif (t := data.get("type")) and t == obj_type:
+                        all_data.append((file.lstat().st_mtime, data))
+                    else:
+                        continue
 
         return {} if not all_data else max(all_data, key=lambda x: x[0])[1]
 
     @classmethod
     def finds(
         cls,
-        obj: object,
+        obj: Union[object, str],
         *,
         path: Optional[Path] = None,
         paths: Optional[list[Path]] = None,
         excluded: Optional[list[str]] = None,
         extras: Optional[DictData] = None,
+        ignore_filename: Optional[str] = None,
     ) -> Iterator[tuple[str, DictData]]:
         """Find all data that match with object type in config path. This class
         method can use include and exclude list of identity name for filter and
         adds-on.
 
-        :param obj: (object) An object that want to validate matching before
-            return.
+        :param obj: (object | str) An object that want to validate matching
+            before return.
         :param path: (Path) A config path object.
         :param paths: (list[Path]) A list of config path object.
         :param excluded: An included list of data key that want to filter from
             data.
         :param extras: (DictData) An extra parameter that use to override core
             config values.
+        :param ignore_filename: (str) An ignore filename. Default is
+            ``.confignore`` filename.
 
         :rtype: Iterator[tuple[str, DictData]]
         """
@@ -292,10 +310,12 @@ class YamlParser:
             paths.append(path)
 
         all_data: dict[str, list[tuple[float, DictData]]] = {}
+        obj_type: str = obj_name(obj)
+
         for path in paths:
             for file in glob_files(path):
 
-                if cls.is_ignore(file, path):
+                if cls.is_ignore(file, path, ignore_filename=ignore_filename):
                     continue
 
                 for key, data in cls.filter_yaml(file).items():
@@ -303,10 +323,7 @@ class YamlParser:
                     if key in excluded:
                         continue
 
-                    if (
-                        data.get("type", "")
-                        == (obj if isclass(obj) else obj.__class__).__name__
-                    ):
+                    if (t := data.get("type")) and t == obj_type:
                         marking: tuple[float, DictData] = (
                             file.lstat().st_mtime,
                             data,

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/event.py

@@ -139,7 +139,7 @@ class Crontab(BaseModel):
         :rtype: Self
         """
         extras: DictData = extras or {}
-        loader: YamlParser = YamlParser(name, extras=extras)
+        loader: YamlParser = YamlParser(name, extras=extras, obj=cls)
 
         # NOTE: Validate the config type match with current connection model
         if loader.type != cls.__name__:

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/stages.py

@@ -1311,6 +1311,17 @@ class CallStage(BaseRetryStage):
         alias="with",
     )
 
+    @field_validator("args", mode="before")
+    def __validate_args_key(cls, value: Any) -> Any:
+        if isinstance(value, dict):
+            if any(k in value for k in ("result", "extras")):
+                raise ValueError(
+                    "The argument on workflow template for the caller stage "
+                    "should not pass `result` and `extras`. They are special "
+                    "arguments."
+                )
+        return value
+
     def execute(
         self,
         params: DictData,
@@ -1348,9 +1359,10 @@ class CallStage(BaseRetryStage):
 
         # VALIDATE: check input task caller parameters that exists before
         #   calling.
-        args: DictData = {"result": result} | param2template(
-            self.args, params, extras=self.extras
-        )
+        args: DictData = {
+            "result": result,
+            "extras": self.extras,
+        } | param2template(self.args, params, extras=self.extras)
         sig = inspect.signature(call_func)
         necessary_params: list[str] = []
         has_keyword: bool = False
@@ -1369,14 +1381,21 @@ class CallStage(BaseRetryStage):
             (k.removeprefix("_") not in args and k not in args)
             for k in necessary_params
         ):
+            necessary_params.remove("result")
+            necessary_params.remove("extras")
+            args.pop("result")
+            args.pop("extras")
             raise ValueError(
                 f"Necessary params, ({', '.join(necessary_params)}, ), "
-                f"does not set to args, {list(args.keys())}."
+                f"does not set to args. It already set {list(args.keys())}."
             )
 
         if "result" not in sig.parameters and not has_keyword:
             args.pop("result")
 
+        if "extras" not in sig.parameters and not has_keyword:
+            args.pop("extras")
+
         if event and event.is_set():
             raise StageCancelError(
                 "Execution was canceled from the event before start parallel."
@@ -1441,9 +1460,10 @@ class CallStage(BaseRetryStage):
 
         # VALIDATE: check input task caller parameters that exists before
         #   calling.
-        args: DictData = {"result": result} | param2template(
-            self.args, params, extras=self.extras
-        )
+        args: DictData = {
+            "result": result,
+            "extras": self.extras,
+        } | param2template(self.args, params, extras=self.extras)
         sig = inspect.signature(call_func)
         necessary_params: list[str] = []
         has_keyword: bool = False
@@ -1462,14 +1482,20 @@ class CallStage(BaseRetryStage):
             (k.removeprefix("_") not in args and k not in args)
             for k in necessary_params
         ):
+            necessary_params.remove("result")
+            necessary_params.remove("extras")
+            args.pop("result")
+            args.pop("extras")
             raise ValueError(
                 f"Necessary params, ({', '.join(necessary_params)}, ), "
-                f"does not set to args, {list(args.keys())}."
+                f"does not set to args. It already set {list(args.keys())}."
             )
-
         if "result" not in sig.parameters and not has_keyword:
             args.pop("result")
 
+        if "extras" not in sig.parameters and not has_keyword:
+            args.pop("extras")
+
         args: DictData = self.validate_model_args(call_func, args, result)
         if inspect.iscoroutinefunction(call_func):
             rs: DictOrModel = await call_func(

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/traces.py

@@ -76,7 +76,7 @@ PREFIX_LOGS_REGEX: re.Pattern[str] = re.compile(
 )  # pragma: no cov
 
 
-class PrefixMsg(BaseModel):
+class Message(BaseModel):
     """Prefix Message model for receive grouping dict from searching prefix data
     from logging message.
     """
@@ -92,9 +92,9 @@ class PrefixMsg(BaseModel):
             msg (str): A message that want to extract.
 
         Returns:
-            PrefixMsg: the validated model from a string message.
+            Message: the validated model from a string message.
         """
-        return PrefixMsg.model_validate(
+        return Message.model_validate(
             obj=PREFIX_LOGS_REGEX.search(msg).groupdict()
         )
 
@@ -126,6 +126,9 @@ class TraceMeta(BaseModel):  # pragma: no cov
     process: int = Field(description="A process ID.")
     thread: int = Field(description="A thread ID.")
     message: str = Field(description="A message log.")
+    cut_id: Optional[str] = Field(
+        default=None, description="A cutting of running ID."
+    )
     filename: str = Field(description="A filename of this log.")
     lineno: int = Field(description="A line number of this log.")
 
@@ -157,6 +160,7 @@ class TraceMeta(BaseModel):  # pragma: no cov
         mode: Literal["stdout", "stderr"],
         message: str,
         level: str,
+        cutting_id: str,
         *,
         extras: Optional[DictData] = None,
     ) -> Self:
@@ -166,6 +170,7 @@ class TraceMeta(BaseModel):  # pragma: no cov
         :param mode: (Literal["stdout", "stderr"]) A metadata mode.
         :param message: (str) A message.
         :param level: (str) A log level.
+        :param cutting_id: (str)
         :param extras: (DictData) An extra parameter that want to override core
             config values.
 
@@ -185,6 +190,7 @@ class TraceMeta(BaseModel):  # pragma: no cov
             process=os.getpid(),
             thread=get_ident(),
             message=message,
+            cut_id=cutting_id,
             filename=frame_info.filename.split(os.path.sep)[-1],
             lineno=frame_info.lineno,
         )
@@ -529,10 +535,7 @@ class ConsoleTrace(BaseTrace):  # pragma: no cov
 
         :rtype: str
         """
-        return prepare_newline(
-            f"({self.cut_id}) "
-            f"{PrefixMsg.from_str(message).prepare(self.extras)}"
-        )
+        return prepare_newline(Message.from_str(message).prepare(self.extras))
 
     def _logging(
         self, message: str, mode: str, *, is_err: bool = False
@@ -655,7 +658,11 @@ class FileTrace(ConsoleTrace):  # pragma: no cov
 
         mode: Literal["stdout", "stderr"] = "stderr" if is_err else "stdout"
         trace_meta: TraceMeta = TraceMeta.make(
-            mode=mode, level=level, message=message, extras=self.extras
+            mode=mode,
+            level=level,
+            message=message,
+            cutting_id=self.cut_id,
+            extras=self.extras,
         )
 
         with (self.pointer / f"{mode}.txt").open(
@@ -684,7 +691,11 @@ class FileTrace(ConsoleTrace):  # pragma: no cov
 
         mode: Literal["stdout", "stderr"] = "stderr" if is_err else "stdout"
         trace_meta: TraceMeta = TraceMeta.make(
-            mode=mode, level=level, message=message, extras=self.extras
+            mode=mode,
+            level=level,
+            message=message,
+            cutting_id=self.cut_id,
+            extras=self.extras,
         )
 
         async with aiofiles.open(

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/utils.py

@@ -11,7 +11,7 @@ import time
 from collections.abc import Iterator
 from datetime import date, datetime, timedelta
 from hashlib import md5
-from inspect import isfunction
+from inspect import isclass, isfunction
 from itertools import product
 from pathlib import Path
 from random import randrange
@@ -303,3 +303,15 @@ def dump_all(
     elif isinstance(value, BaseModel):
         return value.model_dump(by_alias=by_alias)
     return value
+
+
+def obj_name(obj: Optional[Union[str, object]] = None) -> Optional[str]:
+    if not obj:
+        obj_type: Optional[str] = None
+    elif isinstance(obj, str):
+        obj_type: str = obj
+    elif isclass(obj):
+        obj_type: str = obj.__name__
+    else:
+        obj_type: str = obj.__class__.__name__
+    return obj_type

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil/workflow/workflow.py

@@ -126,7 +126,7 @@ class Workflow(BaseModel):
 
         :rtype: Self
         """
-        load: YamlParser = YamlParser(name, path=path, extras=extras)
+        load: YamlParser = YamlParser(name, path=path, extras=extras, obj=cls)
 
         # NOTE: Validate the config type match with current connection model
         if load.type != cls.__name__:

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73/src/ddeutil_workflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddeutil-workflow
-Version: 0.0.71
+Version: 0.0.73
 Summary: Lightweight workflow orchestration with YAML template
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -24,9 +24,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ddeutil[checksum]>=0.4.8
 Requires-Dist: ddeutil-io[toml,yaml]>=0.2.14
-Requires-Dist: pydantic==2.11.5
-Requires-Dist: pydantic-extra-types==2.10.4
-Requires-Dist: python-dotenv==1.1.0
+Requires-Dist: pydantic<3.0.0,==2.11.5
+Requires-Dist: pydantic-extra-types<3.0.0,>=2.10.4
+Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: typer>=0.16.0
 Provides-Extra: all
 Requires-Dist: fastapi<1.0.0,>=0.115.0; extra == "all"

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil_workflow.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ src/ddeutil_workflow.egg-info/top_level.txt
 tests/test__cron.py
 tests/test__regex.py
 tests/test_audits.py
+tests/test_cli.py
 tests/test_conf.py
 tests/test_errors.py
 tests/test_event.py

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/src/ddeutil_workflow.egg-info/requires.txt

@@ -1,8 +1,8 @@
 ddeutil[checksum]>=0.4.8
 ddeutil-io[toml,yaml]>=0.2.14
-pydantic==2.11.5
-pydantic-extra-types==2.10.4
-python-dotenv==1.1.0
+pydantic<3.0.0,==2.11.5
+pydantic-extra-types<3.0.0,>=2.10.4
+python-dotenv>=1.1.0
 typer>=0.16.0
 
 [all]

ddeutil_workflow-0.0.73/tests/test_cli.py

@@ -0,0 +1,15 @@
+import pytest
+from ddeutil.workflow.cli import app
+from typer.testing import CliRunner
+
+
+@pytest.fixture(scope="module")
+def runner() -> CliRunner:
+    return CliRunner()
+
+
+def test_app(runner: CliRunner):
+    result = runner.invoke(app, ["version"])
+    assert result.exit_code == 0
+    assert "ddeutil-workflow==" in result.output
+    assert "python-version==" in result.output

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/tests/test_conf.py

@@ -76,13 +76,22 @@ def test_load_file(target_path: Path):
         "env": "Asia/Bangkok",
     }
 
+    load = YamlParser(
+        "test_load_file", extras={"conf_paths": [target_path]}, obj="Workflow"
+    )
+    assert load.data == {
+        "type": "Workflow",
+        "desc": "Test multi config path",
+        "env": "${WORKFLOW_CORE_TIMEZONE}",
+    }
+
     # NOTE: Raise because passing `conf_paths` invalid type.
     with pytest.raises(TypeError):
         YamlParser("test_load_file", extras={"conf_paths": target_path})
 
 
 def test_load_file_finds(target_path: Path):
-    dummy_file: Path = target_path / "test_simple_file.yaml"
+    dummy_file: Path = target_path / "01_test_simple_file.yaml"
     with dummy_file.open(mode="w") as f:
         yaml.dump(
             {
@@ -90,7 +99,7 @@ def test_load_file_finds(target_path: Path):
                     "type": "Config",
                     "foo": "bar",
                 },
-                "test_load_file": {"type": "Workflow"},
+                "test_load_file": {"type": "Workflow", "data": "foo"},
             },
             f,
         )
@@ -102,6 +111,7 @@ def test_load_file_finds(target_path: Path):
                 {"type": "Config", "foo": "bar"},
             )
         ] == list(YamlParser.finds(Config, path=config.conf_path))
+
         assert [] == list(
             YamlParser.finds(
                 Config,
@@ -110,6 +120,48 @@ def test_load_file_finds(target_path: Path):
             )
         )
 
+    # NOTE: Create duplicate data with the first order by filename.
+    dummy_file_dup: Path = target_path / "00_test_simple_file_duplicate.yaml"
+    with dummy_file_dup.open(mode="w") as f:
+        yaml.dump(
+            {"test_load_file": {"type": "Workflow", "data": "bar"}},
+            f,
+        )
+
+    assert [
+        (
+            "test_load_file",
+            {"type": "Workflow", "data": "bar"},
+        ),
+    ] == list(YamlParser.finds("Workflow", path=target_path))
+
+    dummy_file_dup.unlink()
+
+    # NOTE: Create duplicate data with the first order by filename.
+    dummy_file_dup: Path = target_path / "00_test_simple_file_duplicate.yaml"
+    with dummy_file_dup.open(mode="w") as f:
+        yaml.dump(
+            {"test_load_file": {"type": "Config", "data": "bar"}},
+            f,
+        )
+
+    assert [
+        (
+            "test_load_file",
+            {"type": "Workflow", "data": "foo"},
+        ),
+    ] == list(YamlParser.finds("Workflow", path=target_path))
+
+    load = YamlParser.find("test_load_file", path=target_path, obj="Workflow")
+    assert load == {"type": "Workflow", "data": "foo"}
+
+    # NOTE: Load with the same name, but it set different type.
+    load = YamlParser.find("test_load_file", path=target_path, obj="Config")
+    assert load == {"type": "Config", "data": "bar"}
+
+    load = YamlParser.find("test_load_file", path=target_path, obj="Crontab")
+    assert load == {}
+
     dummy_file.unlink()
 
 
@@ -117,12 +169,7 @@ def test_load_file_finds_raise(target_path: Path):
     dummy_file: Path = target_path / "test_simple_file_raise.yaml"
     with dummy_file.open(mode="w") as f:
         yaml.dump(
-            {
-                "test_load_file_config": {
-                    "foo": "bar",
-                },
-                "test_load_file": {"type": "Workflow"},
-            },
+            {"test_load_file": {"type": "Workflow"}},
             f,
         )
 
@@ -130,27 +177,11 @@ def test_load_file_finds_raise(target_path: Path):
         with pytest.raises(ValueError):
             _ = YamlParser("test_load_file_config", path=config.conf_path).type
 
-
-@pytest.fixture(scope="module")
-def schedule_path(test_path):
-    target_p = test_path / "test_schedule_conf"
-    target_p.mkdir(exist_ok=True)
-
-    with (target_p / "test_schedule_conf.yaml").open(mode="w") as f:
-        yaml.dump(
-            {
-                "schedule-wf": {
-                    "type": "Schedule",
-                    "desc": "Test multi config path",
-                }
-            },
-            f,
+        assert (
+            YamlParser("test_load_file", path=config.conf_path).type
+            == "Workflow"
         )
 
-    yield target_p
-
-    shutil.rmtree(target_p)
-
 
 def test_dynamic():
     conf = dynamic("audit_path", extras={"audit_path": Path("/extras-audits")})

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.73}/tests/test_traces.py

@@ -4,7 +4,7 @@ import pytest
 from ddeutil.workflow import Result
 from ddeutil.workflow.traces import (
     FileTrace,
-    PrefixMsg,
+    Message,
     TraceMeta,
 )
 
@@ -25,7 +25,7 @@ def test_trace_regex_message():
         "[STAGE]: Execute Empty-Stage: 'End trigger Priority Group': "
         "( End trigger Priority Group: 2 )"
     )
-    prefix: PrefixMsg = PrefixMsg.from_str(msg)
+    prefix: Message = Message.from_str(msg)
     assert prefix.name == "STAGE"
     assert prefix.message == (
         "Execute Empty-Stage: 'End trigger Priority Group': "
@@ -36,7 +36,7 @@ def test_trace_regex_message():
         "[]: Execute Empty-Stage: 'End trigger Priority Group': "
         "( End trigger Priority Group: 2 )"
     )
-    prefix: PrefixMsg = PrefixMsg.from_str(msg)
+    prefix: Message = Message.from_str(msg)
     assert prefix.name is None
     assert prefix.message == (
         "[]: Execute Empty-Stage: 'End trigger Priority Group': "
@@ -44,7 +44,7 @@ def test_trace_regex_message():
     )
 
     msg: str = ""
-    prefix: PrefixMsg = PrefixMsg.from_str(msg)
+    prefix: Message = Message.from_str(msg)
     assert prefix.name is None
     assert prefix.message == ""
 
@@ -52,7 +52,7 @@ def test_trace_regex_message():
         "[WORKFLOW]: Execute Empty-Stage:\n'End trigger Priority Group':\n"
         "( End trigger Priority Group: 2 )"
     )
-    prefix: PrefixMsg = PrefixMsg.from_str(msg)
+    prefix: Message = Message.from_str(msg)
     assert prefix.name == "WORKFLOW"
     assert prefix.message == (
         "Execute Empty-Stage:\n'End trigger Priority Group':\n"
@@ -69,13 +69,16 @@ def test_trace_regex_message():
 
 
 def test_trace_meta():
-    meta = TraceMeta.make(mode="stderr", message="Foo", level="info")
+    meta = TraceMeta.make(
+        mode="stderr", message="Foo", level="info", cutting_id=""
+    )
     assert meta.message == "Foo"
 
     meta = TraceMeta.make(
         mode="stderr",
         message="Foo",
         level="info",
+        cutting_id="",
         extras={"logs_trace_frame_layer": 1},
     )
     assert meta.filename == "test_traces.py"
@@ -84,6 +87,7 @@ def test_trace_meta():
         mode="stderr",
         message="Foo",
         level="info",
+        cutting_id="",
         extras={"logs_trace_frame_layer": 2},
     )
     assert meta.filename == "python.py"
@@ -94,6 +98,7 @@ def test_trace_meta():
             mode="stderr",
             message="Foo",
             level="info",
+            cutting_id="",
             extras={"logs_trace_frame_layer": 100},
         )
 

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

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