dv-flow-mgr 0.0.1.13979842530a1__py3-none-any.whl → 0.0.1.14013608039a1__py3-none-any.whl

dv_flow/mgr/cmds/cmd_run.py

@@ -50,7 +50,7 @@ class CmdRun(object):
             tasks = []
             for task in pkg.tasks:
                 tasks.append(task)
-            for frag in pkg.fragment_l:
+            for frag in pkg._fragment_l:
                 for task in frag.tasks:
                     tasks.append(task)
             tasks.sort(key=lambda x: x.name)
@@ -75,7 +75,7 @@ class CmdRun(object):
         # Maybe separate into a task-graph builder and a task-graph runner
 
         # TODO: allow user to specify run root -- maybe relative to some fixed directory?
-        rundir = os.path.join(pkg.basedir, "rundir")
+        rundir = os.path.join(pkg._basedir, "rundir")
 
         builder = TaskGraphBuilder(root_pkg=pkg, rundir=rundir)
         runner = TaskSetRunner(rundir)

dv_flow/mgr/fragment_def.py

@@ -34,7 +34,7 @@ class FragmentDef(BaseModel):
     fragments: List[str] = dc.Field(default_factory=list)
     types : List[TypeDef] = dc.Field(default_factory=list)
 
-    basedir : str = None
+    _basedir : str = None
 
     def getTask(self, name : str) -> 'TaskDef':
         for t in self.tasks:

dv_flow/mgr/package_def.py

@@ -63,15 +63,33 @@ class PackageDef(BaseModel):
         default_factory=list, alias="with",
         description="List of package parameters to set")
 
-    fragment_l : List['FragmentDef'] = dc.Field(default_factory=list, exclude=True)
-    subpkg_m : Dict[str,'PackageDef'] = dc.Field(default_factory=dict, exclude=True)
+    _fragment_l : List['FragmentDef'] = []
+    _subpkg_m : Dict[str,'PackageDef'] = {}
 
 #    import_m : Dict['PackageSpec','Package'] = dc.Field(default_factory=dict)
 
-    basedir : str = None
+    _basedir : str = None
     _log : ClassVar = logging.getLogger("PackageDef")
 
+    @property
+    def fragment_l(self):
+        return self._fragment_l
+    
+    @property
+    def subpkg_m(self):
+        return self._subpkg_m
+
+    @property
+    def basedir(self):
+        return self._basedir
+    
+    @basedir.setter
+    def basedir(self, v):
+        self._basedir = v
+
     def __post_init__(self):
+        self._fragment_l = []
+        self._subpkg_m = {}
         for t in self.tasks:
             t.fullname = self.name + "." + t.name
 
@@ -91,13 +109,13 @@ class PackageDef(BaseModel):
         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
+            tasks_m[task.name] = (task, self._basedir, ) # We'll add a TaskCtor later
 
-        for frag in self.fragment_l:
+        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
+                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()):
@@ -179,14 +197,14 @@ class PackageDef(BaseModel):
 
             try:
                 if modname not in sys.modules:
-                    if self.basedir not in sys.path:
-                        sys.path.append(self.basedir)
+                    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 (basedir=%s): %s" % (
-                    modname, self.basedir, str(e)))
+                raise Exception("Failed to import module %s (_basedir=%s): %s" % (
+                    modname, self._basedir, str(e)))
                 
             if not hasattr(mod, clsname):
                 raise Exception("Method %s not found in module %s" % (clsname, modname))
@@ -326,10 +344,10 @@ class PackageDef(BaseModel):
             except Exception as e:
                 PackageDef._log.error("Failed to load package from %s" % root)
                 raise e
-            pkg.basedir = os.path.dirname(root)
+            pkg._basedir = os.path.dirname(root)
 
 #            for t in pkg.tasks:
-#                t.basedir = os.path.dirname(root)
+#                t._basedir = os.path.dirname(root)
 
         if exp_pkg_name is not None:
             if exp_pkg_name != pkg.name:
@@ -347,7 +365,7 @@ class PackageDef(BaseModel):
             PackageDef._loadFragmentSpec(pkg, spec, file_s)
 
         if len(pkg.imports) > 0:
-            cls._log.info("Loading imported packages (basedir=%s)" % pkg.basedir)
+            cls._log.info("Loading imported packages (_basedir=%s)" % pkg._basedir)
         for imp in pkg.imports:
             if type(imp) == str:
                 imp_path = imp
@@ -359,8 +377,8 @@ class PackageDef(BaseModel):
             cls._log.info("Loading imported package %s" % imp_path)
 
             if not os.path.isabs(imp_path):
-                cls._log.debug("basedir: %s ; imp_path: %s" % (pkg.basedir, imp_path))
-                imp_path = os.path.join(pkg.basedir, imp_path)
+                cls._log.debug("_basedir: %s ; imp_path: %s" % (pkg._basedir, imp_path))
+                imp_path = os.path.join(pkg._basedir, imp_path)
             
             # Search down the tree looking for a flow.dv file
             if os.path.isdir(imp_path):
@@ -389,7 +407,7 @@ class PackageDef(BaseModel):
                 
             sub_pkg = PackageDef.load(imp_path)
             cls._log.info("Loaded imported package %s" % sub_pkg.name)
-            pkg.subpkg_m[sub_pkg.name] = sub_pkg
+            pkg._subpkg_m[sub_pkg.name] = sub_pkg
 
         file_s.pop()
 
@@ -407,10 +425,10 @@ class PackageDef(BaseModel):
         if "package" not in doc.keys():
             raise Exception("Missing 'package' key in %s" % root)
         pkg = PackageDef(**(doc["package"]))
-        pkg.basedir = None
+        pkg._basedir = None
 
 #            for t in pkg.tasks:
-#                t.basedir = os.path.dirname(root)
+#                t._basedir = os.path.dirname(root)
 
         if exp_pkg_name is not None:
             if exp_pkg_name != pkg.name:
@@ -427,10 +445,10 @@ class PackageDef(BaseModel):
         # - File path
         # - Directory path
 
-        if os.path.isfile(os.path.join(pkg.basedir, spec)):
+        if os.path.isfile(os.path.join(pkg._basedir, spec)):
             PackageDef._loadFragmentFile(pkg, spec, file_s)
-        elif os.path.isdir(os.path.join(pkg.basedir, spec)):
-            PackageDef._loadFragmentDir(pkg, os.path.join(pkg.basedir, spec), file_s)
+        elif os.path.isdir(os.path.join(pkg._basedir, spec)):
+            PackageDef._loadFragmentDir(pkg, os.path.join(pkg._basedir, spec), file_s)
         else:
             raise Exception("Fragment spec %s not found" % spec)
 
@@ -454,7 +472,7 @@ class PackageDef(BaseModel):
             if "fragment" in doc.keys():
                 # Merge the package definition
                 frag = FragmentDef(**(doc["fragment"]))
-                frag.basedir = os.path.dirname(file)
-                pkg.fragment_l.append(frag)
+                frag._basedir = os.path.dirname(file)
+                pkg._fragment_l.append(frag)
             else:
                 print("Warning: file %s is not a fragment" % file)

dv_flow/mgr/param_def.py

@@ -23,15 +23,20 @@ from typing import Any, List, Union
 from pydantic import BaseModel, Field
 
 class ListType(BaseModel):
-    item : Union[str, 'ComplexType']
+#    item : Union[str, 'ComplexType']
+    item : Union[str, Any]
 
 class MapType(BaseModel):
-    key : Union[str, 'ComplexType']
-    item : Union[str, 'ComplexType']
+#    key : Union[str, 'ComplexType']
+#    item : Union[str, 'ComplexType']
+    key : Union[str, Any]
+    item : Union[str, Any]
 
 class ComplexType(BaseModel):
     list : Union[ListType, None] = None
     map : Union[MapType, None] = None
+#    list : Union[Any, None] = None
+#    map : Union[Any, None] = None
 
 class ParamDef(BaseModel):
     doc : str = None

dv_flow/mgr/util/__init__.py

@@ -0,0 +1,3 @@
+
+from .util import *
+

dv_flow/mgr/util/__main__.py

@@ -0,0 +1,36 @@
+import argparse
+import logging
+from .cmds.cmd_schema import CmdSchema
+
+def get_parser():
+    parser = argparse.ArgumentParser(description="dv-flow-mgr.util")
+    parser.add_argument("--log-level", 
+                        help="Configures debug level [INFO, DEBUG]",
+                        choices=("NONE", "INFO", "DEBUG"))
+
+    subparsers = parser.add_subparsers(required=True)
+
+    schema = subparsers.add_parser('schema', help='Write schema')
+    schema.add_argument("-o", "--output", 
+                        help="Destination file", 
+                        default="-")
+    schema.set_defaults(f=CmdSchema())
+
+    return parser
+
+
+def main():
+    parser = get_parser()
+    args = parser.parse_args()
+
+    if args.log_level is not None and args.log_level != "NONE":
+        opt_m = {
+            "INFO": logging.INFO,
+            "DEBUG": logging.DEBUG
+        }
+        logging.basicConfig(level=opt_m[args.log_level])
+
+    args.f(args)
+
+if __name__ == "__main__":
+    main()

dv_flow/mgr/util/cmds/cmd_schema.py

@@ -0,0 +1,63 @@
+
+import json
+import sys
+from pydantic import BaseModel
+import pydantic.dataclasses as pdc
+from typing import Union
+from ...fragment_def import FragmentDef
+from ...package_def import PackageDef
+
+class DvFlowSchema(BaseModel):
+    root : Union[PackageDef,FragmentDef] = pdc.Field(default=None)
+
+class CmdSchema(object):
+
+    def __call__(self, args):
+        if args.output == "-":
+            fp = sys.stdout
+        else:
+            fp = open(args.output, "w")
+
+        root_s = DvFlowSchema.model_json_schema(
+            ref_template="#/defs/{model}"
+        )
+        pkg_s = PackageDef.model_json_schema(
+            ref_template="#/defs/{model}"
+        )
+        frag_s = FragmentDef.model_json_schema(
+            ref_template="#/defs/{model}"
+        )
+
+        defs = {}
+        print("root_s keys: %s" % " ".join(root_s.keys()))
+        print("root_s defs: %s" % " ".join(root_s["$defs"].keys()))
+        defs.update(root_s["$defs"])
+#        defs.update(pkg_s["$defs"])
+#        defs.update(frag_s["$defs"])
+
+        for td in defs.keys():
+            defs[td]["$$target"] = "#/defs/%s" % td
+
+        root = {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "$id": "https://dv-flow.github.io/flow.dv.schema.json",
+            "title": "DV Flow-specification schema",
+            "description": "Flow-specification schema",
+            "type": "object",
+            "properties": {
+                "package": {
+                    "$ref": "#/defs/PackageDef",
+                    "title": "Package Definition",
+                    "description": "Package Definition"
+                },
+                "fragment": {
+                    "$ref": "#/defs/FragmentDef"
+                }
+            },
+            "defs": defs,
+        }
+
+        fp.write(json.dumps(root, indent=2))
+
+        if fp != sys.stdout:
+            fp.close()

dv_flow/mgr/{util.py → util/util.py}

@@ -21,7 +21,7 @@
 #****************************************************************************
 import os
 import yaml
-from .package_def import PackageDef
+from ..package_def import PackageDef
 
 def loadProjPkgDef(path):
     """Locates the project's flow spec and returns the PackageDef"""

{dv_flow_mgr-0.0.1.13979842530a1.dist-info → dv_flow_mgr-0.0.1.14013608039a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.1.13979842530a1
+Version: 0.0.1.14013608039a1
 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.13979842530a1.dist-info → dv_flow_mgr-0.0.1.14013608039a1.dist-info}/RECORD

@@ -4,13 +4,13 @@ dv_flow/mgr/eval_jq.py,sha256=bRsHtaN51qIOiZK1VJV52W0-vj5VH0nQ7XIFebZi5kI,1129
 dv_flow/mgr/expr_eval.py,sha256=N_8hRIgzJK9JVqhRt8F9rc4S7AAdKHMMltafqk6KhJs,3113
 dv_flow/mgr/expr_parser.py,sha256=P6u2FdSXeZbdamC3zpEnYKLcK2RULQJfSoev2Ol75fE,6543
 dv_flow/mgr/fileset.py,sha256=cfKem8w5Xw4AUQkC0gyCXof2OlnoJ1t06Iw7IvMyihs,1245
-dv_flow/mgr/fragment_def.py,sha256=nwxx3TW7UMa6uFMp0QEKgJdmOsO2iX89cwyD2beaGoU,1646
+dv_flow/mgr/fragment_def.py,sha256=AHx3ITbiNbGCzlDk5FM8Iimm0GJnWXDDRAoRC1b41jM,1647
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=D-jH3jqoiQG3xZIYgteFLZ4vQ0ZfkbhnW1u6wlyAJMc,1684
-dv_flow/mgr/package_def.py,sha256=ZGanENWXRqYDKL8qiY4JzsGYLm2iXU85XfSAsq_7rIg,17719
+dv_flow/mgr/package_def.py,sha256=0Xv759yzK5n4SKJQBGMPZ06cTNBHt1dtbgKK8fySHJw,18008
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
-dv_flow/mgr/param_def.py,sha256=snLHgafVqqWcDthJUOm9zvKocFsb7-wx2WTc5ltAlhg,1591
+dv_flow/mgr/param_def.py,sha256=mkAw3DanIxcVWRYeh9lUAfUMkpqDFly_Ku_iobr4ix8,1745
 dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ,1981
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
 dv_flow/mgr/pkg_rgy.py,sha256=d1nIjRm3ymMNJT-yiMDxCS6bFisTPvLMqh5VrfsHVKM,5404
@@ -27,8 +27,7 @@ dv_flow/mgr/task_params_ctor.py,sha256=BPkbnoCtzhCxc1g8CJ6VimCcm5UAu92PXeDMhQ4lY
 dv_flow/mgr/task_runner.py,sha256=6yoNzAGb79vgYG95ku_4Kr90cgztdisSICFfV5Ykf9c,8936
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=NDeyplKrPnWwEv4yHkhXEMK9d9j39b5MOeLB-1Mchqo,1095
-dv_flow/mgr/util.py,sha256=BLp-25Ph9roqo1O3VHI5sKhwxQ0wUU7znFwcSKt0hpA,1442
-dv_flow/mgr/cmds/cmd_run.py,sha256=J6uCzzhtGHD9MYkvE0PpX4dkk5KlY3iW7yZ29iBO3js,3196
+dv_flow/mgr/cmds/cmd_run.py,sha256=VL0LU0zYnClQ8Id30sxMN_fHJzQFJsOuj7qDG7GTT60,3198
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=wmn5N_mObx_wr2LPdKOVbNmdM71hhs3UXOv6Ap9l3Ts,2726
 dv_flow/mgr/std/exec.py,sha256=UChqa_tAjvdB1NjqTsvlPgFomP8hMsX2rAOPyUonNpk,3896
@@ -36,9 +35,14 @@ dv_flow/mgr/std/fileset.py,sha256=5IxS6T-x0wzA6fdEQcfHZ9kNP8IpH9hfJ3UMhL4A6Iw,39
 dv_flow/mgr/std/flow.dv,sha256=rl0VZt_H-TyIJq0iERai07aDDZHI86mNozs4gUxidDA,3759
 dv_flow/mgr/std/message.py,sha256=_Gox9oBzL9ZYG1JfJ-WYPXojVLqGNaKxZ9tpLVT0LO0,1035
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/METADATA,sha256=921HoHoEZXZfxF9k4CQQbf6zkncWEd51XcfQKxy-oQA,13336
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13979842530a1.dist-info/RECORD,,
+dv_flow/mgr/util/__init__.py,sha256=6uuA6z5cKS2hcjJw6YyEM2M79g6OpXb6tZF_Gku-AGU,22
+dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,983
+dv_flow/mgr/util/util.py,sha256=yg9oTPRiO87mkCSOQpOtlG9vyKPQzY3qp4OJkEMbWyY,1443
+dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dv_flow/mgr/util/cmds/cmd_schema.py,sha256=lrEI-Jwb8j4I4yYOn9hq7_7NYbK8leVxLesrHyEWm-E,1879
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/METADATA,sha256=dyZoT5Y1QN06lhNQw7MyAC4TsSNVM-VyX0GRWVxuePs,13336
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.14013608039a1.dist-info/RECORD,,