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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddeutil-workflow
-Version: 0.0.71
+Version: 0.0.72
 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.72}/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"]

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

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

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.72}/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.72}/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"
@@ -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,6 +220,7 @@ class YamlParser:
         *,
         path: Optional[Path] = None,
         paths: Optional[list[Path]] = None,
+        obj: Optional[Union[object, str]] = None,
         extras: Optional[DictData] = None,
     ) -> DictData:
         """Find data with specific key and return the latest modify date data if
@@ -226,6 +229,7 @@ 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:
         :param extras: (DictData)  An extra parameter that use to override core
             config values.
 
@@ -243,6 +247,8 @@ 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):
 
@@ -250,14 +256,19 @@ class YamlParser:
                     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 data.get("type", "") == 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,
@@ -268,8 +279,8 @@ class YamlParser:
         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
@@ -292,6 +303,8 @@ 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):
 
@@ -303,10 +316,7 @@ class YamlParser:
                     if key in excluded:
                         continue
 
-                    if (
-                        data.get("type", "")
-                        == (obj if isclass(obj) else obj.__class__).__name__
-                    ):
+                    if data.get("type", "") == obj_type:
                         marking: tuple[float, DictData] = (
                             file.lstat().st_mtime,
                             data,

{ddeutil_workflow-0.0.71 → ddeutil_workflow-0.0.72}/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.72}/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.72}/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.72/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.72
 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.72}/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.72}/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.72/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.72}/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/src/ddeutil/workflow/__about__.py

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