dv-flow-mgr 0.0.1.12992722023a1__py3-none-any.whl → 0.0.1.13335470340a1__py3-none-any.whl

dv_flow/mgr/expr_parser.py

@@ -0,0 +1,38 @@
+import dataclasses as dc
+import enum
+
+class TokenKind(enum.Enum):
+    ID = enum.auto()
+
+@dc.dataclass
+class Expr(object):
+    kind : TokenKind = TokenKind.ID
+
+class ExprId(Expr):
+    id : str
+
+    def __post_init__(self):
+        self.kind = TokenKind.ID
+
+class ExprPipe(Expr):
+    lhs : Expr
+    rhs : Expr
+
+    def __post_init__(self):
+        self.kind = TokenKind.ID
+
+
+
+class ExprParser(object):
+
+    def __init__(self, input):
+        self.input = input
+
+    def __iter__(self):
+        return self
+    
+    def __next__(self):
+
+        self.expr = expr
+        self.tokens = []
+        self.pos = 0

dv_flow/mgr/fragment_def.py

@@ -26,11 +26,13 @@ from typing import Any, Dict, List, Union
 from .package import Package
 from .package_import_spec import PackageImportSpec
 from .task_def import TaskDef
+from .type_def import TypeDef
 
 class FragmentDef(BaseModel):
     tasks : List[TaskDef] = dc.Field(default_factory=list)
     imports : List[Union[str,PackageImportSpec]] = dc.Field(default_factory=list, alias="imports")
     fragments: List[str] = dc.Field(default_factory=list)
+    types : List[TypeDef] = dc.Field(default_factory=list)
 
     basedir : str = None
 

dv_flow/mgr/out

@@ -0,0 +1,12 @@
+	   __main__.py
+	    flow.py
+	   package.py
+	   package_def.py
+	   package_import_spec.py
+	    parameters.py
+	   pkg_rgy.py
+	   task.py
+	   task_graph_builder.py
+	   task_graph_runner.py
+	   util.py
+

dv_flow/mgr/package.py

@@ -31,6 +31,7 @@ class Package(object):
     # Package holds constructors for tasks
     # - Dict holds the default parameters for the task
     tasks : Dict[str,TaskCtor] = dc.field(default_factory=dict)
+    types : Dict[str,Any] = dc.field(default_factory=dict)
     _log : ClassVar = logging.getLogger("Package")
 
     def getTaskCtor(self, name : str) -> TaskCtor:

dv_flow/mgr/package_def.py

@@ -19,6 +19,7 @@
 #*     Author: 
 #*
 #****************************************************************************
+import io
 import os
 import json
 import yaml
@@ -35,6 +36,7 @@ from .package_import_spec import PackageImportSpec, PackageSpec
 from .task import TaskCtor, TaskCtorProxy, TaskCtorCls, TaskCtorParam, TaskCtorParamCls
 from .task_def import TaskDef, TaskSpec
 from .std.task_null import TaskNull
+from .type_def import TypeDef
 
 
 class PackageDef(BaseModel):
@@ -44,6 +46,7 @@ class PackageDef(BaseModel):
     tasks : List[TaskDef] = dc.Field(default_factory=list)
     imports : List[PackageImportSpec] = dc.Field(default_factory=list)
     fragments: List[str] = dc.Field(default_factory=list)
+    types : List[TypeDef] = dc.Field(default_factory=list)
 
     fragment_l : List['FragmentDef'] = dc.Field(default_factory=list, exclude=True)
 
@@ -314,6 +317,32 @@ class PackageDef(BaseModel):
         file_s.pop()
 
         return pkg
+
+    @staticmethod
+    def loads(data, exp_pkg_name=None):
+        return PackageDef._loadPkgDefS(data, exp_pkg_name)
+        pass
+
+    @staticmethod
+    def _loadPkgDefS(data, exp_pkg_name):
+        ret = None
+        doc = yaml.load(io.StringIO(data), Loader=yaml.FullLoader)
+        if "package" not in doc.keys():
+            raise Exception("Missing 'package' key in %s" % root)
+        pkg = PackageDef(**(doc["package"]))
+        pkg.basedir = None
+
+#            for t in pkg.tasks:
+#                t.basedir = os.path.dirname(root)
+
+        if exp_pkg_name is not None:
+            if exp_pkg_name != pkg.name:
+                raise Exception("Package name mismatch: %s != %s" % (exp_pkg_name, pkg.name))
+
+        if len(pkg.fragments) > 0:
+            raise Exception("Cannot load a package-def with fragments from a string")
+
+        return pkg
     
     @staticmethod
     def _loadFragmentSpec(pkg, spec, file_s):

dv_flow/mgr/param_def.py

@@ -0,0 +1,25 @@
+
+from typing import Any, List, Union
+from pydantic import BaseModel, Field
+
+class ListType(BaseModel):
+    item : Union[str, 'ComplexType']
+
+class MapType(BaseModel):
+    key : Union[str, 'ComplexType']
+    item : Union[str, 'ComplexType']
+
+class ComplexType(BaseModel):
+    list : Union[ListType, None] = None
+    map : Union[MapType, None] = None
+
+class ParamDef(BaseModel):
+    name : str
+    doc : str = None
+    type : Union[str, 'ComplexType'] = None
+    value : Union[Any, None] = None
+    append : Union[Any, None] = None
+    prepend : Union[Any, None] = None
+    path_append : Union[Any, None] = Field(alias="path-append", default=None)
+    path_prepend : Union[Any, None] = Field(alias="path-prepend", default=None)
+

dv_flow/mgr/std/flow.dv

@@ -27,4 +27,52 @@ package:
 #  - name: Exec
 #    pyclass: dv_flow.mgr.std.exec.Exec
 #    with: {}
-      
+  types:
+  # - name: TaskDataItem
+  #   doc: |
+  #     Base type for a data element produced by a task.
+  #     TaskDataItem is never used directly
+  #   with:
+  #   - name: kind
+  #     type: str
+  #     kind: metadata
+  #     doc: |
+  #       Kind of data item
+  #   - name: src
+  #     type: str
+  #     kind: metadata
+  #     doc: |
+  #       Name of the task that produced this item
+  #   - name: id
+  #     type: str
+  #     kind: metadata
+  #     doc: |
+  #       Unique identiifer 
+
+  - name: Env
+    doc: |
+      Environment variables
+    with:
+    - name: doc
+
+  - name: FileSet
+    uses: TaskDataItem
+    with:
+    - name: kind
+      value: "FileSet"
+    - name: base
+      type: str
+    - name: fileType
+      type: str
+    - name: files
+      type: 
+        list:
+          item:
+            type: str
+
+    # type:
+    #   list: (str,int)
+    #     - complex type
+    # type:
+    #   object:
+    #     

dv_flow/mgr/task_data.py

@@ -48,26 +48,22 @@ class TaskDataParam(BaseModel):
     kind : TaskDataParamKindE
     ops : List[TaskDataParamOp] = dc.Field(default_factory=list)
 
+class TaskDataItem(BaseModel):
+    type : str
+    src : str
+    id : str
+
 class TaskData(BaseModel):
     src : str = None
-    params : Dict[str,TaskDataParam] = dc.Field(default_factory=dict)
     deps : Dict[str,Set[str]] = dc.Field(default_factory=dict)
-    filesets : List[FileSet] = dc.Field(default_factory=list)
     changed : bool = False
+    data : List[TaskDataItem] = dc.Field(default_factory=list)
 
     _log : ClassVar = logging.getLogger("TaskData")
 
-    def hasParam(self, name: str) -> bool:
-        return name in self.params
-    
-    def getParam(self, name: str) -> Any:
-        return self.params[name]
-    
-    def setParam(self, name: str, value: Any):
-        self.params[name] = value
-
-    def addFileSet(self, fs : FileSet):
-        self.filesets.append(fs)
+    def addData(self, item : TaskDataItem):
+        item.src = self.src
+        self.data.append(item)
 
     def getFileSets(self, type=None, order=True) -> List[FileSet]:
         ret = []
@@ -77,8 +73,10 @@ class TaskData(BaseModel):
         if order:
             # The deps map specifies task dependencies
 
+            filesets = filter(lambda x: x.type == "std.FileSet", self.data)
+
             candidate_fs = []
-            for fs in self.filesets:
+            for fs in filesets:
                 self._log.debug("fs: %s" % str(fs))
                 if type is None or fs.type in type:
                     candidate_fs.append(fs)

dv_flow/mgr/task_def.py

@@ -22,7 +22,9 @@
 import pydantic.dataclasses as dc
 from pydantic import BaseModel
 from typing import Any, Dict, List, Union, Tuple
+from .param_def import ParamDef
 from .task import Task
+from .task_output import TaskOutput
 
 @dc.dataclass
 class TaskSpec(object):
@@ -37,7 +39,8 @@ class TaskDef(BaseModel):
     desc : str = dc.Field(default="")
     doc : str = dc.Field(default="")
     depends : List[Union[str,TaskSpec]] = dc.Field(default_factory=list, alias="needs")
-    params: Dict[str,Any] = dc.Field(default_factory=dict, alias="with")
+    params: List[ParamDef] = dc.Field(default_factory=list, alias="with")
+    out: List[TaskOutput] = dc.Field(default_factory=list)
 
     def copy(self) -> 'TaskDef':
         ret = TaskDef(

dv_flow/mgr/task_impl_data.py

@@ -0,0 +1,17 @@
+
+from pydantic import BaseModel
+from typing import Any, ClassVar, Dict, Set, List, Tuple
+
+class TaskImplParams(BaseModel):
+    pass
+
+class TaskImplSourceData(BaseModel):
+    params : Any
+    changed : bool
+    memento : Any
+
+class TaskImplResultData(BaseModel):
+    data : List[Any]
+    changed : bool
+    memento : Any
+

dv_flow/mgr/task_output.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel, Field
+from typing import Any, List
+
+class TaskOutput(BaseModel):
+    type : str
+    params : List[Any] = Field(default_factory=list, alias="with")

dv_flow/mgr/type_def.py

@@ -0,0 +1,10 @@
+
+from typing import List, Union
+from pydantic import BaseModel, Field
+from .param_def import ParamDef
+
+class TypeDef(BaseModel):
+    name : str
+    uses : str = None
+    doc : str = None
+    fields : List[ParamDef] = Field(alias="with", default_factory=list)

{dv_flow_mgr-0.0.1.12992722023a1.dist-info → dv_flow_mgr-0.0.1.13335470340a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12992722023a1
+Version: 0.0.1.13335470340a1
 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.12992722023a1.dist-info → dv_flow_mgr-0.0.1.13335470340a1.dist-info}/RECORD

@@ -1,28 +1,35 @@
 dv_flow/mgr/__init__.py,sha256=IZA7I1u7RH34DrJXSkETxWFpK5Jn_A2zXfnCAzJ8XxA,289
 dv_flow/mgr/__main__.py,sha256=uik6gDAvtZNG0yyDKYc4FTl6R1QHAR543jNG2lCAa6E,1771
+dv_flow/mgr/expr_parser.py,sha256=4gVpWvBWkI6KfTN2PAXhZtAgKIRLxfFs5Gc5IAa27Dg,605
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
-dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1552
-dv_flow/mgr/package.py,sha256=AOLEEotVQF9VNMMl13uNQ7Na2TuHPXxEvybBOX7XIps,1615
-dv_flow/mgr/package_def.py,sha256=iHBFV-CKyCypvrd31zm3Yjkcib9xZo1gFlFL7YMfJO8,14012
+dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
+dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
+dv_flow/mgr/package.py,sha256=MDnt9q4pD_Aex_hSK_EUQ38IiaxOihgxbMmk5dH1deQ,1674
+dv_flow/mgr/package_def.py,sha256=Sv3KS5pDysUrtPBWElCvmWt2pnkTipZcZGYwKr5N7Mc,14967
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
+dv_flow/mgr/param_def.py,sha256=e2WvRCMArbgcsKC4TKQqZTscZmCdo3WvVR6w3LN0VK8,727
 dv_flow/mgr/pkg_rgy.py,sha256=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
 dv_flow/mgr/task.py,sha256=giy5elwIS_fab6wGnA8JCeZIEeX0nG5zpcq5ifGYSOs,9087
-dv_flow/mgr/task_data.py,sha256=XBPWwvuaQ3BZ94wknvv1bqLh98iTzAg5fskv7_kk6DQ,10524
-dv_flow/mgr/task_def.py,sha256=96hSwqJo0MazJ1VcLhovYRmNCplsNLt47AumtyjSddU,1690
+dv_flow/mgr/task_data.py,sha256=ZKoYUhXGyLXXm4GvpS-UDwJ_lZH72lgpzOdHm1XDObY,10386
+dv_flow/mgr/task_def.py,sha256=6qDDgge5RXssL5TAZR01dGb_Vjvbj72tJirg66O-Yt4,1818
 dv_flow/mgr/task_graph_builder.py,sha256=4dfy_T26MYI7ls2xiofr4V0ItZHDehU2iw6UBPt-SZQ,7074
 dv_flow/mgr/task_graph_runner.py,sha256=NwNYcOJ952lPMLwIIlYE9CoDdedqvcw2fWHYUsKFXuU,2164
 dv_flow/mgr/task_graph_runner_local.py,sha256=66JYJcu-W60LjfuT9UkbcKslNqDcD5q4UR7ZAWrSaGM,4707
+dv_flow/mgr/task_impl_data.py,sha256=bFPijoKrh9x7fZN2DsvRJp0UHo-gGM0VjtDQISyfhFk,321
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
+dv_flow/mgr/task_output.py,sha256=l-W-FvVo6YDah1RQS-I9N0KUtB3vp-kl7lxIdmNz0l4,178
+dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dv_flow/mgr/type_def.py,sha256=KdhuNlfw-NKU-4VZFCnMPyj775yEB7cpr5tz73a9yuQ,259
 dv_flow/mgr/util.py,sha256=06eVyURF4ga-s8C9Sd3ZSDebwO4QS0XXaB8xADVbWRc,1437
 dv_flow/mgr/cmds/cmd_run.py,sha256=eths8kT7mBmpZqwOuMtpKAaux4rg-f7hPBxxTHbpKT4,2903
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/fileset.py,sha256=uP7bGntRq-Tn5_GEFnt0_J_OAmfvep3GlCwCuE8by4o,2710
-dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
+dv_flow/mgr/std/flow.dv,sha256=j9wLrF3Ghh1ZLbJxmk7WiNiRYUYEer-8CCUA5hsgtfk,1409
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
 dv_flow/mgr/std/task_null.py,sha256=KObmjG_4D08GJ1k6neqKIQrFY72Sj0jLnwXxEkq5HA0,321
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/METADATA,sha256=kCTd3eqAjQmtiL2_rnfPvCERKOp4I3aRl3yusyz4xMw,13276
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12992722023a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/METADATA,sha256=NP0fraxF2IX1pTGM8-F-suzwkkbWU09BFex8ktZSVc8,13276
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13335470340a1.dist-info/RECORD,,