ddeutil-workflow 0.0.45__tar.gz → 0.0.46__tar.gz

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddeutil-workflow
-Version: 0.0.45
+Version: 0.0.46
 Summary: Lightweight workflow orchestration
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -9,7 +9,7 @@ Project-URL: Source Code, https://github.com/ddeutils/ddeutil-workflow/
 Keywords: orchestration,workflow
 Classifier: Topic :: Utilities
 Classifier: Natural Language :: English
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/pyproject.toml

@@ -12,8 +12,7 @@ keywords = ['orchestration', 'workflow']
 classifiers = [
     "Topic :: Utilities",
     "Natural Language :: English",
-    "Development Status :: 4 - Beta",
-    # "Development Status :: 5 - Production/Stable",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "Programming Language :: Python",

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

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

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil/workflow/conf.py

@@ -26,7 +26,10 @@ PREFIX: str = "WORKFLOW"
 
 
 def env(var: str, default: str | None = None) -> str | None:  # pragma: no cov
-    """Get environment variable with uppercase and adding prefix string."""
+    """Get environment variable with uppercase and adding prefix string.
+
+    :rtype: str | None
+    """
     return os.getenv(f"{PREFIX}_{var.upper().replace(' ', '_')}", default)
 
 
@@ -42,29 +45,7 @@ __all__: TupleStr = (
 )
 
 
-class BaseConfig:  # pragma: no cov
-    """BaseConfig object inheritable."""
-
-    __slots__ = ()
-
-    @property
-    def root_path(self) -> Path:
-        """Root path or the project path.
-
-        :rtype: Path
-        """
-        return Path(os.getenv("ROOT_PATH", "."))
-
-    @property
-    def conf_path(self) -> Path:
-        """Config path that use root_path class argument for this construction.
-
-        :rtype: Path
-        """
-        return self.root_path / os.getenv("CONF_PATH", "conf")
-
-
-class Config(BaseConfig):  # pragma: no cov
+class Config:  # pragma: no cov
     """Config object for keeping core configurations on the current session
     without changing when if the application still running.
 
@@ -217,6 +198,7 @@ class Config(BaseConfig):  # pragma: no cov
 
 
 class APIConfig:
+    """API Config object."""
 
     @property
     def prefix_path(self) -> str:

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil/workflow/job.py

@@ -641,6 +641,9 @@ def local_execute_strategy(
 
     for stage in job.stages:
 
+        if job.extras:
+            stage.extras = job.extras
+
         if stage.is_skipped(params=context):
             result.trace.info(f"[STAGE]: Skip stage: {stage.iden!r}")
             stage.set_outputs(output={"skipped": True}, to=context)

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil/workflow/stages.py

@@ -814,6 +814,8 @@ class CallStage(BaseStage):
                 run_id=gen_id(self.name + (self.id or ""), unique=True)
             )
 
+        print("Extras in CallStage", self.extras)
+
         t_func: TagFunc = extract_call(
             param2template(self.uses, params, extras=self.extras),
             registries=self.extras.get("regis_call"),
@@ -976,6 +978,8 @@ class ParallelStage(BaseStage):  # pragma: no cov
         params: DictData,
         result: Result,
         stages: list[Stage],
+        *,
+        extras: DictData | None = None,
     ) -> DictData:
         """Task execution method for passing a branch to each thread.
 
@@ -984,12 +988,16 @@ class ParallelStage(BaseStage):  # pragma: no cov
         :param result: (Result) A result object for keeping context and status
             data.
         :param stages:
+        :param extras
 
         :rtype: DictData
         """
         context = {"branch": branch, "stages": {}}
         result.trace.debug(f"[STAGE]: Execute parallel branch: {branch!r}")
         for stage in stages:
+            if extras:
+                stage.extras = extras
+
             try:
                 stage.set_outputs(
                     stage.handler_execute(
@@ -1048,6 +1056,7 @@ class ParallelStage(BaseStage):  # pragma: no cov
                         params=params,
                         result=result,
                         stages=self.parallel[branch],
+                        extras=self.extras,
                     )
                 )
 
@@ -1144,6 +1153,10 @@ class ForEachStage(BaseStage):
             context = {"stages": {}}
 
             for stage in self.stages:
+
+                if self.extras:
+                    stage.extras = self.extras
+
                 try:
                     stage.set_outputs(
                         stage.handler_execute(
@@ -1284,6 +1297,9 @@ class CaseStage(BaseStage):  # pragma: no cov
 
             if match == _condition:
                 stage: Stage = match.stage
+                if self.extras:
+                    stage.extras = self.extras
+
                 try:
                     stage.set_outputs(
                         stage.handler_execute(

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil/workflow/workflow.py

@@ -1139,7 +1139,7 @@ class Workflow(BaseModel):
                 not_timeout_flag := ((time.monotonic() - ts) < timeout)
             ):
                 job_id: str = job_queue.get()
-                job: Job = self.jobs[job_id]
+                job: Job = self.job(name=job_id)
 
                 if (check := job.check_needs(context["jobs"])) == WAIT:
                     job_queue.task_done()
@@ -1231,7 +1231,7 @@ class Workflow(BaseModel):
                 not_timeout_flag := ((time.monotonic() - ts) < timeout)
             ):
                 job_id: str = job_queue.get()
-                job: Job = self.jobs[job_id]
+                job: Job = self.job(name=job_id)
 
                 if (check := job.check_needs(context["jobs"])) == WAIT:
                     job_queue.task_done()

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil_workflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddeutil-workflow
-Version: 0.0.45
+Version: 0.0.46
 Summary: Lightweight workflow orchestration
 Author-email: ddeutils <korawich.anu@gmail.com>
 License: MIT
@@ -9,7 +9,7 @@ Project-URL: Source Code, https://github.com/ddeutils/ddeutil-workflow/
 Keywords: orchestration,workflow
 Classifier: Topic :: Utilities
 Classifier: Natural Language :: English
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/src/ddeutil_workflow.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 src/ddeutil/workflow/__about__.py
 src/ddeutil/workflow/__cron.py
 src/ddeutil/workflow/__init__.py
+src/ddeutil/workflow/__main__.py
 src/ddeutil/workflow/__types.py
 src/ddeutil/workflow/conf.py
 src/ddeutil/workflow/cron.py

{ddeutil_workflow-0.0.45 → ddeutil_workflow-0.0.46}/tests/test_workflow_exec.py

@@ -1,8 +1,10 @@
+import shutil
 from datetime import datetime
+from textwrap import dedent
 from unittest import mock
 
 from ddeutil.core import getdot
-from ddeutil.workflow import SUCCESS, Workflow
+from ddeutil.workflow import SUCCESS, Workflow, extract_call
 from ddeutil.workflow.conf import Config
 from ddeutil.workflow.job import Job
 from ddeutil.workflow.result import FAILED, Result
@@ -488,6 +490,55 @@ def test_workflow_exec_call(test_path):
         } == rs.context
 
 
+def test_workflow_exec_call_override_registry(test_path):
+    task_path = test_path.parent / "mock_tests"
+    task_path.mkdir(exist_ok=True)
+    (task_path / "__init__.py").open(mode="w")
+    (task_path / "mock_tasks").mkdir(exist_ok=True)
+
+    with (task_path / "mock_tasks/__init__.py").open(mode="w") as f:
+        f.write(
+            dedent(
+                """
+            from ddeutil.workflow import tag, Result
+
+            @tag("v1", alias="get-info")
+            def get_info(result: Result):
+                result.trace.info("... [CALLER]: Info from mock tasks")
+                return {"get-info": "success"}
+
+            """.strip(
+                    "\n"
+                )
+            )
+        )
+
+    with dump_yaml_context(
+        test_path / "conf/demo/01_99_wf_test_wf_exec_call_override.yml",
+        data="""
+        tmp-wf-exec-call-override:
+          type: Workflow
+          jobs:
+            first-job:
+              stages:
+                - name: "Call from mock tasks"
+                  uses: mock_tasks/get-info@v1
+        """,
+    ):
+        func = extract_call("mock_tasks/get-info@v1", registries=["mock_tests"])
+        assert func().name == "get-info"
+
+        workflow = Workflow.from_conf(
+            name="tmp-wf-exec-call-override",
+            extras={"regis_call": ["mock_tests"]},
+        )
+        rs = workflow.execute(params={})
+        assert rs.status == SUCCESS
+        print(rs.context)
+
+    shutil.rmtree(task_path)
+
+
 def test_workflow_exec_call_with_prefix(test_path):
     with dump_yaml_context(
         test_path / "conf/demo/01_99_wf_test_wf_call_mssql_proc.yml",

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

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