flowweave 1.0.1__tar.gz → 2.0.1__tar.gz

{flowweave-1.0.1 → flowweave-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowweave
-Version: 1.0.1
+Version: 2.0.1
 Summary: YAML-based workflow runner for task orchestration
 Author: syatch
 License: MIT

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave/__init__.py

@@ -1,6 +1,6 @@
-__version__ = "1.0.1"
+__version__ = "2.0.1"
 __author__ = "syatch"
 __license__ = "MIT"
 
 from .flowweave import FlowWeave, FlowWeaveTask
-from .base import Result, FlowWeaveTaskRunner
+from .base import Result, TaskData, FlowWeaveTaskRunner

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave/base.py

@@ -2,6 +2,8 @@
 from enum import IntEnum
 from typing import IO, Optional
 
+from colorama import Fore
+
 class Result(IntEnum):
     FAIL = 0
     SUCCESS = 1
@@ -29,6 +31,17 @@ class TaskData:
         self.show_log = show_log
 
 class FlowWeaveTaskRunner:
+    def __init__(self, prev_future):
+        self.prev_future = prev_future
+        self.return_data = None
+
+    def __call__(self) -> Result:
+        result = self.run()
+        return result
+
+    def run(self) -> Result:
+        return Result.SUCCESS
+
     def set_task_data(self, task_data: TaskData) -> None:
         self.task_data = task_data
 
@@ -49,4 +62,23 @@ class FlowWeaveTaskRunner:
 
         args = [f"{head}: {str(a)}" for a in args]
 
-        print(*args, sep=sep, end=end, file=file, flush=flush)
+        print(*args, sep=sep, end=end, file=file, flush=flush)
+
+    def error(self,
+                *args: object,
+                sep: str = " ",
+                end: str = "\n",
+                file: Optional[IO[str]] = None,
+                flush: bool = False) -> None:
+        if not self.task_data:
+            raise Exception("task_data is 'None'")
+
+        part_num = self.task_data.flow_part
+        all_num = self.task_data.flow_all
+        stage = self.task_data.stage_name
+        task = self.task_data.name
+        head = f"[Flow {part_num} / {all_num}] {stage}/{task}"
+
+        args = [f"{head}: {Fore.RED}{str(a)}" for a in args]
+
+        print(*args, sep=sep, end=end, file=file, flush=flush)

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave/cli.py

@@ -8,6 +8,7 @@ import colorama
 
 # Local application / relative imports
 from .flowweave import FlowWeave
+from .base import Result
 
 def get_setting_path(args):
     setting_path = None
@@ -22,9 +23,9 @@ def serialize(obj) -> str:
         return obj.__name__
     raise TypeError(f"Type {type(obj)} not serializable")
 
-def show_flow_op(setting_path: str, flow_name: str) -> None:
+def show_flow_op(setting_path: str, flow_name: str, info: bool = False) -> None:
     flow_data = FlowWeave.load_and_validate_schema(file=setting_path, schema="flow")
-    op_dic = FlowWeave.get_op_dic(flow_data)
+    op_dic = FlowWeave.get_op_dic(flow_data, info=info)
     print_op_dic(op_dic, flow_name)
 
 def show_available_op() -> None:
@@ -58,6 +59,8 @@ def build_parser() -> argparse.ArgumentParser:
     return parser
 
 def main() -> None:
+    result = Result.SUCCESS
+
     colorama.init(autoreset=True)
 
     parser = build_parser()
@@ -68,14 +71,14 @@ def main() -> None:
     if args.command == "run":
         if not setting_path:
             parser.error("run requires flow_file")
-        FlowWeave.run(setting_file=setting_path, parallel=args.parallel, show_log = args.log)
-        return
-
-    if args.command == "info":
+        results = FlowWeave.run(setting_file=setting_path, parallel=args.parallel, show_log = args.log)
+        result = all(x == Result.SUCCESS for x in results)
+    elif args.command == "info":
         if args.flow_file:
-            show_flow_op(setting_path, args.flow_file)
+            show_flow_op(setting_path, args.flow_file, info=True)
         else:
             show_available_op()
-        return
+    else:
+        parser.print_help()
 
-    parser.print_help()
+    return result

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave/flowweave.py

@@ -1,11 +1,12 @@
 # Standard library
 import copy
 import importlib
+from importlib.resources import files
 import itertools
 import json
 import logging
 from pathlib import Path
-from importlib.resources import files
+import sys
 
 # Third-party
 import jsonschema
@@ -43,7 +44,7 @@ class FlowWeaveTask():
     @task
     def start(prev_future, task_data: TaskData):
         try:
-            task_instance = task_data.task_class.runner()
+            task_instance = task_data.task_class.runner(prev_future)
         except AttributeError:
             raise TypeError(f"{task_data.task_class} must define runner")
 
@@ -58,7 +59,6 @@ class FlowWeaveTask():
             else:
                 if task_data.show_log:
                     FlowWeave._print_log(f"Task option {key} not found: ignore")
-
         run_task = True
         if prev_future:
             if "pre_success" == task_data.do_only:
@@ -70,7 +70,7 @@ class FlowWeaveTask():
             FlowWeaveTask.message_task_start(prev_future, task_data)
 
             try:
-                task_result = task_instance()
+                task_result, return_data = task_instance()
             except Exception as e:
                 FlowMessage.error(e)
                 task_result = Result.FAIL
@@ -80,7 +80,7 @@ class FlowWeaveTask():
             FlowWeaveTask.message_task_ignore(prev_future, task_data)
             task_result = Result.IGNORE
 
-        return {"name" : task_data.name, "option" : task_data.option, "result" : task_result}
+        return {"name" : task_data.name, "option" : task_data.option, "data" : return_data, "result" : task_result}
 
     def message_task_start(prev_future, task_data: TaskData):
         if prev_future:
@@ -171,7 +171,7 @@ class FlowWeave():
 
         return data
 
-    def get_op_dic(flow_data: dict):
+    def get_op_dic(flow_data: dict, info: bool = False):
         return_dic = dict()
 
         op_source = flow_data.get("op_source")
@@ -179,7 +179,7 @@ class FlowWeave():
         for source in op_source_list:
             source_name = f"task/{source}"
             setting_file = f"{source_name.replace('.', '/')}/op_code.yml"
-            return_dic |= FlowWeave._get_op_dic_from_setting_file(setting_file)
+            return_dic |= FlowWeave._get_op_dic_from_setting_file(setting_file, info=info)
 
         return return_dic
 
@@ -190,33 +190,44 @@ class FlowWeave():
         avaliable_settings = [str(f) for f in base_path.rglob("op_code.yml")]
         for setting in avaliable_settings:
             place = setting.replace("\\", ".").removeprefix("task.").removesuffix(".op_code.yml")
-            return_dic[place] = FlowWeave._get_op_dic_from_setting_file(setting.replace("\\", "/"))
+            return_dic[place] = FlowWeave._get_op_dic_from_setting_file(setting.replace("\\", "/"), info=True)
 
         return return_dic
 
-    def _get_op_dic_from_setting_file(setting_file: str):
+    def _get_op_dic_from_setting_file(setting_file: str, info: bool = False):
         return_dic = dict()
 
         setting = FlowWeave.load_and_validate_schema(setting_file, "op_code")
         source_name = setting_file.removesuffix("/op_code.yml").replace("/", ".")
 
+        task_root = Path("task").resolve()
+        if str(task_root.parent) not in sys.path:
+            sys.path.insert(0, str(task_root.parent))
+
         op_dic = setting.get("op", {})
         for op, op_info in op_dic.items():
             script_name = op_info.get('script')
-            op_class = FlowWeave._get_op_class(source_name, script_name)
+            op_class = FlowWeave._get_op_class(source_name, script_name, info)
 
             return_dic[str(op)] = op_class
 
         return return_dic
 
-    def _get_op_class(source_name: str, script_name: str):
-        file_path = Path(f"{source_name.replace('.', '/')}/{script_name}.py").resolve()
-        spec = importlib.util.spec_from_file_location(file_path.stem, file_path)
-        module = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(module)
-        op_class = getattr(module, "Task")
+    def _get_op_class(source_name: str, script_name: str, info: bool = False):
+        module_name = f"{source_name}.{script_name}"
+        try:
+            module = importlib.import_module(module_name)
+        except Exception as e:
+            raise RuntimeError(f"Failed to import {module_name}: {e}")
+
+        if not hasattr(module, "Task"):
+            raise RuntimeError(f"'Task' class not found in {module_name}")
+
+        return_module = module.Task
+        if info:
+            return_module = module.Task.runner
 
-        return op_class
+        return return_module
 
     def _get_global_option_comb(global_option: dict) -> list:
         keys = list(global_option.keys())
@@ -343,4 +354,4 @@ class FlowWeave():
                 FlowWeave._run_task(stage_data, link, future, visited.copy(), show_log)
             )
 
-        return futures
+        return futures

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave/message.py

@@ -9,8 +9,12 @@ from .base import Result, TaskData
 
 class FlowMessage:
     @staticmethod
-    def _print(text: str) -> None:
-        print(text)
+    def _print(*args: object,
+               sep: str = " ",
+               end: str = "\n",
+               file: Optional[IO[str]] = None,
+               flush: bool = False) -> None:
+        print(*args, sep=sep, end=end, file=file, flush=flush)
 
     @staticmethod
     def get_result_text(result: Result) -> str:
@@ -21,9 +25,9 @@ class FlowMessage:
         elif Result.IGNORE == result:
             text = f"{Fore.CYAN}IGNORE"
         elif Result.FAIL == result:
-            text = f"{Fore.CYAN}FAIL"
+            text = f"{Fore.RED}FAIL"
         else:
-            text = f"{Fore.RED}UNKNOWN: {result.name}({result.value})"
+            text = f"{Fore.MAGENTA}UNKNOWN: {result.name}({result.value})"
 
         return text
 
@@ -87,4 +91,4 @@ class FlowMessage:
               file: Optional[IO[str]] = None,
               flush: bool = False) -> None:
         args = [f"{Fore.RED}{str(a)}" for a in args]
-        FlowMessage._print(*args, sep=sep, end=end, file=file, flush=flush)
+        FlowMessage._print(*args, sep=sep, end=end, file=file, flush=flush)

{flowweave-1.0.1 → flowweave-2.0.1}/flowweave.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowweave
-Version: 1.0.1
+Version: 2.0.1
 Summary: YAML-based workflow runner for task orchestration
 Author: syatch
 License: MIT

{flowweave-1.0.1 → flowweave-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flowweave"
-version = "1.0.1"
+version = "2.0.1"
 description = "YAML-based workflow runner for task orchestration"
 authors = [{name = "syatch"}]
 readme = "README.md"