update: ExecProto and Executor

Author: shijinPJ

dingo/exec/base.py

@@ -1,6 +1,7 @@
+import inspect
 from abc import ABC, abstractmethod
 from functools import wraps
-from typing import Any, Dict, List, Protocol, Union
+from typing import Any, Dict, List, Protocol, Type, Union
 
 from dingo.io import MetaData, SummaryModel
 
@@ -19,35 +20,18 @@ def summarize(self, inputs: MetaData) -> SummaryModel:
         ...
 
 
-class Executor(ABC):
-    exec_map: Dict[str, Any] = {}
-
-    @abstractmethod
-    def load_data(self) -> List[MetaData]:
-        raise NotImplementedError()
-
-    @abstractmethod
-    def execute(self, *args, **kwargs) -> List[SummaryModel]:
-        raise NotImplementedError()
-
-    @abstractmethod
-    def evaluate(self, *args, **kwargs) -> Union[SummaryModel, List[SummaryModel], Any]:
-        raise NotImplementedError()
-
-    @abstractmethod
-    def summarize(self) -> SummaryModel:
-        raise NotImplementedError()
+class Executor:
+    exec_map: Dict[str, Type[ExecProto]] = {}
 
     @classmethod
     def register(cls, exec_name: str):
 
         def decorator(root_exec):
             cls.exec_map[exec_name] = root_exec
 
-            @wraps(root_exec)
-            def wrapped_function(*args, **kwargs):
-                return root_exec(*args, **kwargs)
-
-            return wrapped_function
+            if inspect.isclass(root_exec):
+                return root_exec
+            else:
+                raise ValueError("root_exec must be a class")
 
         return decorator

dingo/exec/local.py

@@ -9,7 +9,7 @@
 
 from dingo.config import GlobalConfig
 from dingo.data import Dataset, DataSource, dataset_map, datasource_map
-from dingo.exec.base import Executor
+from dingo.exec.base import ExecProto, Executor
 from dingo.io import InputArgs, MetaData, ResultInfo, SummaryModel
 from dingo.model import Model
 from dingo.model.llm.base import BaseLLM
@@ -21,7 +21,7 @@
 
 
 @Executor.register('local')
-class LocalExecutor(Executor):
+class LocalExecutor(ExecProto):
 
     def __init__(self, input_args: InputArgs):
         self.input_args: InputArgs = input_args

dingo/exec/spark.py

@@ -5,7 +5,7 @@
 
 from dingo.config import GlobalConfig
 from dingo.data import Dataset, DataSource, dataset_map, datasource_map
-from dingo.exec.base import Executor
+from dingo.exec.base import ExecProto, Executor
 from dingo.io import InputArgs, MetaData, ResultInfo, SummaryModel
 from dingo.model import Model
 from dingo.model.llm.base import BaseLLM
@@ -19,7 +19,7 @@
 
 
 @Executor.register('spark')
-class SparkExecutor(Executor):
+class SparkExecutor(ExecProto):
     """
     Spark executor
     """