ddeutil-workflow 0.0.71__py3-none-any.whl → 0.0.72__py3-none-any.whl

ddeutil/workflow/__about__.py

@@ -1 +1 @@
-__version__: str = "0.0.71"
+__version__: str = "0.0.72"

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/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/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/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/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.dist-info → ddeutil_workflow-0.0.72.dist-info}/METADATA

@@ -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.dist-info → ddeutil_workflow-0.0.72.dist-info}/RECORD

@@ -1,30 +1,30 @@
-ddeutil/workflow/__about__.py,sha256=rGClYdU_G91zwBxZHz_ffWrmbiq8rrJJRS0kmAdKXPQ,28
+ddeutil/workflow/__about__.py,sha256=VthLlJATFFZHEcP5syc1TRdzGF0zHfM2k5hzVK_WmRk,28
 ddeutil/workflow/__cron.py,sha256=BOKQcreiex0SAigrK1gnLxpvOeF3aca_rQwyz9Kfve4,28751
 ddeutil/workflow/__init__.py,sha256=HUy9XkBe7ttpUupJS4JDuj3aGp2QmJZfz8m2kHAIwdw,927
 ddeutil/workflow/__main__.py,sha256=Qd-f8z2Q2vpiEP2x6PBFsJrpACWDVxFKQk820MhFmHo,59
 ddeutil/workflow/__types.py,sha256=uNfoRbVmNK5O37UUMVnqcmoghD9oMS1q9fXC0APnjSI,4584
 ddeutil/workflow/audits.py,sha256=1pg4a5wdZCAKOqMr1Z_ofzRAFsDarN1BIJenWwn9xkg,11435
-ddeutil/workflow/cli.py,sha256=96IHeF18zrrnpMfSbJuoSJBt_21NfuDCcRvGw63IG0Y,5154
-ddeutil/workflow/conf.py,sha256=KcvOlU0zzS53iK44X_T64qHSX9nr4EHGjGX31dsRiUE,13609
+ddeutil/workflow/cli.py,sha256=7cdn4f9KYOBK4CFs7sGmM2c0iYvzXiPtHnklSuD7ObU,5676
+ddeutil/workflow/conf.py,sha256=ZkXNiiIljqNVoLo46Gbp37-NNMfDCz5g9JiyNeJNoXE,13973
 ddeutil/workflow/errors.py,sha256=O5rq80Sqj0QMeIsWXpRUhiFLTq0o8bwm5BQ4kuq6xmI,3013
-ddeutil/workflow/event.py,sha256=e3xcECfMvH6K8Tff9cjCXIItVJjOmlonAQ0l253l6T0,11110
+ddeutil/workflow/event.py,sha256=0fGcous2vAF5DZ-aengk_vovgHoWNRoIiidSxk9ytkw,11119
 ddeutil/workflow/job.py,sha256=kviOQeSUsx0Z7CL0foblTulg2m_l6a3M3SMRxg9RWeg,39151
 ddeutil/workflow/params.py,sha256=Pco3DyjptC5Jkx53dhLL9xlIQdJvNAZs4FLzMUfXpbQ,12402
 ddeutil/workflow/result.py,sha256=ctxNSaY9tZPHEAUgvDkjWWu2APeTmlZCf1Hb0XVbbFo,8173
 ddeutil/workflow/reusables.py,sha256=LSn0XTkzGHf4ulOmWub29F0JZHt0NEyzrFd4ZFx_g_k,21622
 ddeutil/workflow/stages.py,sha256=kzMEMRTEuG52EOw51zyVO6LE-oiiqTIRUCk_OMcWZTM,106506
 ddeutil/workflow/traces.py,sha256=DrKzxgp9FJUJd_oWYHiMtR1z8R7HeweAL4_Y8q0_pz8,25048
-ddeutil/workflow/utils.py,sha256=65aMH2JKeeG7GLLoD0D5_0Cv55XV5EUd1Gn-Zz21hwo,9339
-ddeutil/workflow/workflow.py,sha256=nPjNbn0UUKlUwkh7lHFRb5BSLARBOTZ0iv0TU_SMOKc,36205
+ddeutil/workflow/utils.py,sha256=-yWVShFGUJwUL5DU4xi-f2UGLXEuuv8sTf-GmVGjNt0,9674
+ddeutil/workflow/workflow.py,sha256=sy-HEKLmGPE1tDNr_cpm3CQsMEDP6fkXDHC9UsVSVDE,36214
 ddeutil/workflow/api/__init__.py,sha256=W3fe6_NLHSUzr4Tsu79w3pmvrYjpLeP3zBk4mtpPyqg,2843
 ddeutil/workflow/api/log_conf.py,sha256=WfS3udDLSyrP-C80lWOvxxmhd_XWKvQPkwDqKblcH3E,1834
 ddeutil/workflow/api/routes/__init__.py,sha256=JRaJZB0D6mgR17MbZo8yLtdYDtD62AA8MdKlFqhG84M,420
 ddeutil/workflow/api/routes/job.py,sha256=x809G5gCbJS257txj9eLLTbCbFK8ercXWzPDLuv5gEM,2953
 ddeutil/workflow/api/routes/logs.py,sha256=HiXw93PeIiaK_xJjM8lbD2ED1Il-W1iM51085nc7qmg,5286
 ddeutil/workflow/api/routes/workflows.py,sha256=D76cdLb2_9Dkfe2_8xt06CvPhAyJMqxyYkUgAs8Qlnw,4402
-ddeutil_workflow-0.0.71.dist-info/licenses/LICENSE,sha256=nGFZ1QEhhhWeMHf9n99_fdt4vQaXS29xWKxt-OcLywk,1085
-ddeutil_workflow-0.0.71.dist-info/METADATA,sha256=F_JLg23VojSqmw0cBb_KvkEXOUrKNB_9HFE6lVIiYA0,15207
-ddeutil_workflow-0.0.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ddeutil_workflow-0.0.71.dist-info/entry_points.txt,sha256=qDTpPSauL0ciO6T4iSVt8bJeYrVEkkoEEw_RlGx6Kgk,63
-ddeutil_workflow-0.0.71.dist-info/top_level.txt,sha256=m9M6XeSWDwt_yMsmH6gcOjHZVK5O0-vgtNBuncHjzW4,8
-ddeutil_workflow-0.0.71.dist-info/RECORD,,
+ddeutil_workflow-0.0.72.dist-info/licenses/LICENSE,sha256=nGFZ1QEhhhWeMHf9n99_fdt4vQaXS29xWKxt-OcLywk,1085
+ddeutil_workflow-0.0.72.dist-info/METADATA,sha256=rXtrkQ-LS9dx4DIIWOAz44e0bXSGrm_zujUNvb-uujs,15221
+ddeutil_workflow-0.0.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ddeutil_workflow-0.0.72.dist-info/entry_points.txt,sha256=qDTpPSauL0ciO6T4iSVt8bJeYrVEkkoEEw_RlGx6Kgk,63
+ddeutil_workflow-0.0.72.dist-info/top_level.txt,sha256=m9M6XeSWDwt_yMsmH6gcOjHZVK5O0-vgtNBuncHjzW4,8
+ddeutil_workflow-0.0.72.dist-info/RECORD,,