dv-flow-mgr 0.0.1.12822558956a1__tar.gz → 0.0.1.12849118090a1__tar.gz

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12822558956a1
+Version: 0.0.1.12849118090a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/ivpm.yaml

@@ -1,10 +1,6 @@
 
 package:
-  name: pytest-fv
-
-  #  setup-deps:
-  #- ninja
-  #- cython
+  name: dv-flow-mgr
 
   dep-sets:
 
@@ -22,6 +18,8 @@ package:
     - name: svdep
       url: https://github.com/fvutils/svdep.git
       anonymous: True
+    - name: dv-flow-lib-hdlsim
+      url: http://github.com/dv-flow/dv-flow-lib-hdlsim.git
     - name: ply 
       src: pypi
     - name: pyyaml

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.12822558956a1"
+version = "0.0.1.12849118090a1"
 dependencies = [
     "pyyaml",
     "toposort",

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/src/dv_flow_mgr/package.py

@@ -54,26 +54,6 @@ class Package(object):
     def getTaskCtor(self, name : str) -> TaskCtor:
         return self.tasks[name]
             
-    def mkTaskParams(self, name : str) -> TaskParams:
-        if name not in self.tasks:
-            raise Exception("Task " + name + " not found")
-        return self.tasks[name].mkTaskParams()
-    
-    def setTaskParams(self, name : str, params : TaskParams, pvals : Dict[str,Any]):
-        if name not in self.tasks:
-            raise Exception("Task " + name + " not found")
-        self.tasks[name].setTaskParams(params, pvals)
-
-    def mkTask(self, 
-               name : str, 
-               task_id : int, 
-               session : 'Session',
-               params : TaskParams,
-               depends : List['Task']) -> 'Task':
-        # TODO: combine parameters to create the full taskname
-        task =  self.tasks[name].mkTask(name, task_id, session, params, depends)
-        return task
-
     def __hash__(self):
         return hash(self.fullname())
 

dv_flow_mgr-0.0.1.12849118090a1/src/dv_flow_mgr/package_def.py

@@ -0,0 +1,210 @@
+#****************************************************************************
+#* package_def.py
+#*
+#* Copyright 2023 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
+import json
+import importlib
+import sys
+import pydantic
+import pydantic.dataclasses as dc
+from pydantic import BaseModel
+from typing import Any, Dict, List, Callable, Tuple
+from .flow import Flow
+from .fragment_def import FragmentDef
+from .package import Package
+from .package_import_spec import PackageImportSpec, PackageSpec
+from .task import TaskCtor, TaskParams
+from .task_def import TaskDef, TaskSpec
+from .tasklib.builtin_pkg import TaskNull
+
+
+class PackageDef(BaseModel):
+    name : str
+    params : Dict[str,Any] = dc.Field(default_factory=dict)
+    type : List[PackageSpec] = dc.Field(default_factory=list)
+    tasks : List[TaskDef] = dc.Field(default_factory=list)
+    imports : List[PackageImportSpec] = dc.Field(default_factory=list)
+    fragments: List[str] = dc.Field(default_factory=list)
+
+    fragment_l : List['FragmentDef'] = dc.Field(default_factory=list, exclude=True)
+
+#    import_m : Dict['PackageSpec','Package'] = dc.Field(default_factory=dict)
+
+    basedir : str = None
+
+    def getTask(self, name : str) -> 'TaskDef':
+        for t in self.tasks:
+            if t.name == name:
+                return t
+    
+    def mkPackage(self, session, params : Dict[str,Any] = None) -> 'Package':
+        ret = Package(self.name)
+
+        session.push_package(ret)
+
+        tasks_m : Dict[str,str,TaskCtor]= {}
+
+        for task in self.tasks:
+            if task.name in tasks_m.keys():
+                raise Exception("Duplicate task %s" % task.name)
+            tasks_m[task.name] = (task, self.basedir, ) # We'll add a TaskCtor later
+
+        for frag in self.fragment_l:
+            for task in frag.tasks:
+                if task.name in tasks_m.keys():
+                    raise Exception("Duplicate task %s" % task.name)
+                tasks_m[task.name] = (task, frag.basedir, ) # We'll add a TaskCtor later
+
+        # Now we have a unified map of the tasks declared in this package
+        for name in list(tasks_m.keys()):
+            task_i = tasks_m[name]
+            if len(task_i) < 3:
+                # Need to create the task ctor
+                ctor_t = self.mkTaskCtor(session, task_i[0], task_i[1], tasks_m)
+                tasks_m[name] = (task_i[0], task_i[1], ctor_t)
+            ret.tasks[name] = tasks_m[name][2]
+
+        session.pop_package(ret)
+
+        return ret
+    
+    def mkTaskCtor(self, session, task, srcdir, tasks_m) -> TaskCtor:
+        ctor_t : TaskCtor = None
+
+        if task.uses is not None:
+            # Find package (not package_def) that implements this task
+            # Insert an indirect reference to that tasks's constructor
+            last_dot = task.uses.rfind('.')
+
+            if last_dot != -1:
+                pkg_name = task.uses[:last_dot]
+                task_name = task.uses[last_dot+1:]
+            else:
+                pkg_name = None
+                task_name = task.uses
+
+            if pkg_name is not None:
+                pkg = session.getPackage(PackageSpec(pkg_name))
+                if pkg is None:
+                    raise Exception("Failed to find package %s" % pkg_name)
+                ctor_t = pkg.getTaskCtor(task_name)
+                ctor_t = ctor_t.copy()
+                ctor_t.srcdir = srcdir
+            else:
+                if task_name not in tasks_m.keys():
+                    raise Exception("Failed to find task %s" % task_name)
+                if len(tasks_m[task_name]) == 3:
+                    ctor_t = tasks_m[task_name][2].copy()
+                    ctor_t.srcdir = srcdir
+                else:
+                    task_i = tasks_m[task_name]
+                    ctor_t = self.mkTaskCtor(
+                        session, 
+                        task=task_i[0], 
+                        srcdir=srcdir,
+                        tasks_m=tasks_m)
+                    tasks_m[task_name] = ctor_t
+
+        if ctor_t is None:
+            # Provide a default implementation
+            ctor_t = TaskCtor(
+                task_ctor=TaskNull,
+                param_ctor=TaskParams,
+                srcdir=srcdir)
+
+        if task.pyclass is not None:
+            # Built-in impl
+            # Now, lookup the class
+            last_dot = task.pyclass.rfind('.')
+            clsname = task.pyclass[last_dot+1:]
+            modname = task.pyclass[:last_dot]
+
+            try:
+                if modname not in sys.modules:
+                    if self.basedir not in sys.path:
+                        sys.path.append(self.basedir)
+                    mod = importlib.import_module(modname)
+                else:
+                    mod = sys.modules[modname]
+            except ModuleNotFoundError as e:
+                raise Exception("Failed to import module %s" % modname)
+                
+            if not hasattr(mod, clsname):
+                raise Exception("Class %s not found in module %s" % (clsname, modname))
+            ctor_t.task_ctor = getattr(mod, clsname)
+
+            if task.uses is None:
+                ctor_t.param_ctor = TaskParams
+
+        decl_params = False
+        for value in task.params.values():
+            if "type" in value:
+                decl_params = True
+                break
+        
+        if decl_params:
+            # We need to combine base parameters with new parameters
+            field_m = {}
+            # First, add parameters from the base class
+            for fname,info in ctor_t.param_ctor.model_fields.items():
+                print("Field: %s (%s)" % (fname, info.default))
+                field_m[fname] = (info.annotation, info.default)
+            ptype_m = {
+                "str" : str,
+                "int" : int,
+                "float" : float,
+                "bool" : bool
+            }
+            for p in task.params.keys():
+                param = task.params[p]
+                if type(param) == dict and "type" in param.keys():
+                    ptype_s = param["type"]
+                    if ptype_s not in ptype_m.keys():
+                        raise Exception("Unknown type %s" % ptype_s)
+                    ptype = ptype_m[ptype_s]
+
+                    if p in field_m.keys():
+                        raise Exception("Duplicate field %s" % p)
+                    if "value" in param.keys():
+                        field_m[p] = (ptype, param["value"])
+                    else:
+                        field_m[p] = (ptype, )
+                else:
+                    if p not in field_m.keys():
+                        raise Exception("Field %s not found" % p)
+                    if type(param) != dict:
+                        value = param
+                    elif "value" in param.keys():
+                        value = param["value"]
+                    else:
+                        raise Exception("No value specified for param %s: %s" % (
+                            p, str(param)))
+                    field_m[p] = (field_m[p][0], value)
+            print("field_m: %s" % str(field_m))
+            ctor_t.param_ctor = pydantic.create_model(
+                "Task%sParams" % task.name, **field_m)
+        else:
+            if len(task.params) > 0:
+                ctor_t.params = task.params
+            if len(task.depends) > 0:
+                ctor_t.depends.extends(task.depends)
+
+        return ctor_t
+

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/src/dv_flow_mgr/session.py

@@ -27,7 +27,7 @@ from typing import Any, Callable, Dict, List
 from .fragment_def import FragmentDef
 from .package import Package
 from .package_def import PackageDef, PackageSpec
-from .task import Task,TaskSpec
+from .task import Task, TaskSpec, TaskCtor
 
 @dc.dataclass
 class Session(object):
@@ -45,29 +45,36 @@ class Session(object):
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
     _pkg_def_m : Dict[str,PackageDef] = dc.field(default_factory=dict)
+    _pkg_file_m : Dict[str,str] = dc.field(default_factory=dict)
+    _pkg_path : List[str] = dc.field(default_factory=list)
     _task_list : List[Task] = dc.field(default_factory=list)
     _task_m : Dict[TaskSpec,Task] = dc.field(default_factory=dict)
     _task_id : int = 0
 
     def __post_init__(self):
-        from .tasklib.std.pkg_std import PackageStd
-        from .tasklib.hdl.sim.vcs_pkg import VcsPackage
-        from .tasklib.hdl.sim.vlt_pkg import VltPackage
-        from .tasklib.hdl.sim.mti_pkg import MtiPackage
-        self._pkg_m[PackageSpec("std")] = PackageStd("std")
-        self._pkg_m[PackageSpec("hdl.sim.mti")] = MtiPackage("hdl.sim.mti")
-        self._pkg_m[PackageSpec("hdl.sim.vcs")] = VcsPackage("hdl.sim.vcs")
-        self._pkg_m[PackageSpec("hdl.sim.vlt")] = VltPackage("hdl.sim.vlt")
-
-    def load(self, root : str):
-        if not os.path.isdir(root):
-            raise Exception("Root directory %s does not exist" % root)
-
-        if not os.path.isfile(os.path.join(root, "flow.yaml")):
+        # Add a reference to the built-in 'std' package
+        this_dir = os.path.dirname(os.path.abspath(__file__))
+        self._pkg_file_m["std"] = os.path.join(this_dir, "tasklib/std/flow.dv")
+
+        # from .tasklib.std.pkg_std import PackageStd
+        # from .tasklib.hdl.sim.vcs_pkg import VcsPackage
+        # from .tasklib.hdl.sim.vlt_pkg import VltPackage
+        # from .tasklib.hdl.sim.mti_pkg import MtiPackage
+        # self._pkg_m[PackageSpec("std")] = PackageStd("std")
+        # self._pkg_m[PackageSpec("hdl.sim.mti")] = MtiPackage("hdl.sim.mti")
+        # self._pkg_m[PackageSpec("hdl.sim.vcs")] = VcsPackage("hdl.sim.vcs")
+        # self._pkg_m[PackageSpec("hdl.sim.vlt")] = VltPackage("hdl.sim.vlt")
+        pass
+
+    def load(self):
+        if not os.path.isdir(self.srcdir):
+            raise Exception("Root directory %s does not exist" % self.srcdir)
+
+        if not os.path.isfile(os.path.join(self.srcdir, "flow.dv")):
             raise Exception("No root flow file")
 
-        self._root_dir = os.path.dirname(root)
-        self.package = self._load_package(os.path.join(root, "flow.yaml"), [])
+        self._root_dir = os.path.dirname(self.srcdir)
+        self.package = self._load_package(os.path.join(self.srcdir, "flow.dv"), [])
 
         return self.package
 
@@ -77,7 +84,7 @@ class Session(object):
 
         return self._mkTaskGraph(task, self.rundir)
         
-    def _mkTaskGraph(self, task : str, parent_rundir : str, params : dict = None) -> Task:
+    def _mkTaskGraph(self, task : str, parent_rundir : str) -> Task:
 
         elems = task.split(".")
 
@@ -99,23 +106,19 @@ class Session(object):
         
         self._pkg_s.append(pkg)
 
-        #task_def = pkg.getTask(task_name)
+        ctor_t : TaskCtor = pkg.getTaskCtor(task_name)
 
         depends = []
 
-        params = pkg.mkTaskParams(task_name)
-
-        task_id = self.mkTaskId(None)
-#        task_name = "%s.%s" % (pkg.name, task_def.name)
-
         # The returned task should have all param references resolved
-        task = pkg.mkTask(
-            task_name,
-            task_id,
-            self,
-            params,
-            depends)
-        task.rundir = rundir
+        print("task_ctor=%s" % str(ctor_t.task_ctor), flush=True)
+        task = ctor_t.task_ctor(
+            name=task_name,
+            session=self,
+            params=ctor_t.mkParams(),
+            depends=depends,
+            rundir=rundir,
+            srcdir=ctor_t.srcdir)
         
         for i,d in enumerate(task.depend_refs):
             if d in self._task_m.keys():
@@ -130,6 +133,15 @@ class Session(object):
         self._pkg_spec_s.pop()
 
         return task
+
+    def push_package(self, pkg : Package):
+        self._pkg_s.append(pkg)
+
+    def pop_package(self, pkg : Package):
+        self._pkg_s.pop()
+
+    def package(self):
+        return self._pkg_s[-1]
     
     def mkTaskId(self, task : 'Task') -> int:
         self._task_id += 1
@@ -158,13 +170,13 @@ class Session(object):
 
         if not len(self._pkg_spec_s):
             self._pkg_spec_s.append(PackageSpec(pkg.name))
-            self._pkg_def_m[PackageSpec(pkg.name)] = pkg
         else:
-            if self._pkg_spec_s[0].name != pkg.name:
-                raise Exception("Package name mismatch: %s != %s" % (self._pkg_m[0].name, pkg.name))
+            if self._pkg_spec_s[-1].name != pkg.name:
+                raise Exception("Package name mismatch: %s != %s" % (self._pkg_spec_s[-1].name, pkg.name))
             else:
                 # TODO: merge content
                 self._pkg_spec_s.append(PackageSpec(pkg.name))
+        self._pkg_def_m[PackageSpec(pkg.name)] = pkg
 
         print("pkg: %s" % str(pkg))
 
@@ -219,9 +231,12 @@ class Session(object):
 
 
     def getPackage(self, spec : PackageSpec) -> Package:
+        # Obtain the active package definition
         pkg_spec = self._pkg_spec_s[-1]
         pkg_def = self._pkg_def_m[pkg_spec]
 
+        print("spec: %s ; _pkg_def_m: %s" % (str(spec), str(self._pkg_def_m.keys())))
+
         # Need a stack to track which package we are currently in
         # Need a map to get a concrete package from a name with parameterization
 
@@ -261,30 +276,49 @@ class Session(object):
                         pkg = base.mkPackage(self, spec.params)
                         self._pkg_m[spec] = pkg
                         break
+            
+            if pkg is None:
+                # Look in the set of registered packages
+                if spec.name in self._pkg_file_m.keys():
+                    # Load the package
+                    self._pkg_spec_s.append(spec)
+                    pkg_def = self._load_package(
+                        self._pkg_file_m[spec.name], 
+                        [])
+
+                    self._pkg_spec_s.pop()
+
+                    # The definition is now in the map, so recurse to create it
+                    pkg = self.getPackage(spec)
+                else:
+                    # Go search the package path
+                    pass
+                
+
 
             if pkg is None:
                 raise Exception("Failed to find package %s from package %s" % (
                     spec.name, pkg_def.name))
 
-#            base_spec = PackageSpec(spec.name)
-#            if not base_spec in self._pkg_def_m.keys():
-#                # Template is not present. Go find it...
-#
-#                # If not found...
-#                raise Exception("Package %s not found" % spec.name)
-
         return pkg
         
     def getTaskCtor(self, spec : TaskSpec, pkg : PackageDef) -> 'TaskCtor':
         spec_e = spec.name.split(".")
         task_name = spec_e[-1]
-        pkg_name = ".".join(spec_e[0:-1])
 
-        try:
-            pkg = self.getPackage(PackageSpec(pkg_name))
-        except Exception as e:
-            print("Failed to find package %s while looking for task %s" % (pkg_name, spec.name))
-            raise e
+        if len(spec_e) == 1:
+            # Just have a task name. Use the current package
+            if len(self._pkg_s) == 0:
+                raise Exception("No package context for task %s" % spec.name)
+            pkg = self._pkg_s[-1]
+        else:
+            pkg_name = ".".join(spec_e[0:-1])
+
+            try:
+                pkg = self.getPackage(PackageSpec(pkg_name))
+            except Exception as e:
+                print("Failed to find package %s while looking for task %s" % (pkg_name, spec.name))
+                raise e
 
         return pkg.getTaskCtor(task_name)
 

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/src/dv_flow_mgr/task.py

@@ -24,7 +24,7 @@ import json
 import asyncio
 import dataclasses as dc
 from pydantic import BaseModel
-from typing import Any, Dict, List, Tuple
+from typing import Any, Callable, Dict, List, Tuple
 from .task_data import TaskData
 from .task_memento import TaskMemento
 
@@ -37,78 +37,32 @@ class TaskParams(BaseModel):
 
 @dc.dataclass
 class TaskCtor(object):
-    def mkTaskParams(self) -> TaskParams:
-        raise NotImplementedError()
-    
-    def setTaskParams(self, params : TaskParams, pvals : Dict[str,Any]):
-        for p in pvals.keys():
-            if not hasattr(params, p):
-                raise Exception("Unsupported parameter: " + p)
-            else:
-                setattr(params, p, pvals[p])
-
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : TaskParams, depends : List['Task']) -> 'Task':
-        raise NotImplementedError()
-
-@dc.dataclass
-class TaskCtorT(TaskCtor):
-    TaskParamsT : TaskParams
-    TaskT : 'Task'
-
-    def mkTaskParams(self) -> TaskParams:
-        return self.TaskParamsT()
-
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : TaskParams, depends : List['Task']) -> 'Task':
-        task = self.TaskT(
-            name=name, 
-            task_id=task_id, 
-            session=session, 
-            params=params, 
-            depends=depends)
-        task.depends.extend(depends)
-        return task
-
-@dc.dataclass
-class TaskParamCtor(object):
-    base : TaskCtor
-    params : Dict[str,Any]
-    basedir : str
-    depend_refs : List['TaskSpec']
-
-    def mkTaskParams(self) -> TaskParams:
-        params = self.base.mkTaskParams()
-        self.base.setTaskParams(params, self.params)
-        return params
-    
-    def setTaskParams(self, params : Dict, pvals : Dict[str,Any]):
-        pass
-
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : Dict, depends : List['Task']) -> 'Task':
-        task =  self.base.mkTask(
-            name=name, 
-            task_id=task_id, 
-            session=session, 
-            params=params, 
-            depends=depends)
-        task.basedir = self.basedir
-        task.depend_refs.extend(self.depend_refs)
-        return task
-
-@dc.dataclass
-class PackageTaskCtor(TaskCtor):
-    name : str
-    pkg : 'Package'
-
-    def mkTaskParams(self, params : Dict) -> Dict:
-        return self.pkg.mkTaskParams(self.name, params)
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : Dict, depends : List['Task']) -> 'Task':
-        return self.pkg.mkTask(self.name, task_id, session, params, depends)
+    task_ctor : Callable
+    param_ctor : Callable
+    params : Dict[str,Any] = None
+    srcdir : str = None
+    depends : List[TaskSpec] = dc.field(default_factory=list)
+
+    def copy(self):
+        return TaskCtor(
+            task_ctor=self.task_ctor,
+            param_ctor=self.param_ctor,
+            params=self.params,
+            srcdir=self.srcdir,
+            depends=self.depends.copy())
+
+    def mkParams(self):
+        print("mkParams: %s" % str(self.params))
+        ret = self.param_ctor()
+        if self.params is not None:
+            for k,v in self.params.items():
+                setattr(ret, k, v)
+        return ret
 
 @dc.dataclass
 class Task(object):
     """Executable view of a task"""
     name : str
-    task_id : int
     session : 'Session'
     params : TaskParams
     basedir : str

{dv_flow_mgr-0.0.1.12822558956a1 → dv_flow_mgr-0.0.1.12849118090a1}/src/dv_flow_mgr/task_def.py

@@ -28,11 +28,13 @@ from .task import Task
 class TaskSpec(object):
     name : str
 
-
 class TaskDef(BaseModel):
     """Holds definition information (ie the YAML view) for a task"""
     name : str
-    type : Union[str,TaskSpec] = dc.Field(default_factory=list)
+#    type : Union[str,TaskSpec] = dc.Field(default_factory=list)
+    uses : str = dc.Field(default=None)
+    pyclass : str = dc.Field(default=None)
+    doc : str = dc.Field(default=None)
     depends : List[Union[str,TaskSpec]] = dc.Field(default_factory=list, alias="needs")
     params: Dict[str,Any] = dc.Field(default_factory=dict, alias="with")
 

dv_flow_mgr-0.0.1.12849118090a1/src/dv_flow_mgr/tasklib/builtin_pkg.py

@@ -0,0 +1,62 @@
+# import os
+# import sys
+# import glob
+# import fnmatch
+# import importlib
+# import pydantic.dataclasses as dc
+# from ..package import TaskCtor
+from ..task import Task
+from ..task_data import TaskData
+# from ..task_memento import TaskMemento
+# from typing import List, Tuple
+# import dataclasses as dc
+# from ..package_def import Package
+
+# class TaskPyClass(Task):
+#     pyclass : str = None
+
+#     async def run(self, input : TaskData) -> TaskData:
+
+#         if self.srcdir not in sys.path:
+#             sys.path.insert(0, self.srcdir)
+
+#         print("sys.path: %s" % str(sys.path), flush=True)
+#         idx = self.params.pyclass.rfind('.')
+#         modname = self.params.pyclass[:idx]
+#         clsname = self.params.pyclass[idx+1:]
+
+#         if os.path.isfile(os.path.join(self.basedir, "my_module.py")):
+#             print("my_module.py exists", flush=True)
+#         else:
+#             print("my_module.py does not exist", flush=True)
+
+#         if modname in sys.modules.keys():
+#             module = sys.modules[modname]
+#         else:
+#             try:
+#                 print("modname=%s" % modname, flush=True)
+#                 module = importlib.import_module(modname)
+#             except ModuleNotFoundError as e:
+#                 print("Module not found: %s syspath=%s" % (str(e), str(sys.path)), flush=True)
+#                 raise e
+
+#         cls = getattr(module, clsname)
+
+#         obj = cls(self.name, self.task_id, self.session, self.basedir, srcdir=self.srcdir)
+
+#         return await obj.run(input)
+
+
+# class TaskPyClassMemento(TaskMemento):
+#     pass
+
+class TaskNull(Task):
+    async def run(self, input : TaskData) -> TaskData:
+        return input
+
+# @dc.dataclass
+# class PackageBuiltin(Package):
+
+#     def __post_init__(self):
+#         print("PackageBuiltin::__post_init__", flush=True)
+#         self.tasks["PyClass"] = TaskPyClass()