dv-flow-mgr 0.0.1.13525773676a1__py3-none-any.whl → 0.0.1.13577785562a1__py3-none-any.whl

dv_flow/mgr/eval_jq.py

@@ -0,0 +1,16 @@
+
+import jq
+
+def eval_jq(input, args):
+    if len(args) != 1:
+        raise Exception("jq requires a single argument")
+
+    filt = jq.compile(args[0])
+
+    if type(input) == str:
+        ret = filt.input_text(input).text()
+    else:
+        ret = filt.input_value(input).text()
+
+
+    return ret

dv_flow/mgr/expr_eval.py

@@ -1,5 +1,6 @@
 
 import dataclasses as dc
+import json
 from typing import Any, Callable, Dict, List
 from .expr_parser import ExprVisitor, Expr, ExprBin, ExprBinOp, ExprCall, ExprId, ExprString, ExprInt
 
@@ -18,15 +19,30 @@ class ExprEval(ExprVisitor):
         return val
     
     def _toString(self, val):
+        rval = val
+        if type(val) != str:
+            obj = self._toObject(val)
+            rval = json.dumps(obj)
+        return rval
+#        if isinstance(val, list):
+#            val = '[' + ",".join(self._toString(v) for v in val) + ']'
+#        elif hasattr(val, "model_dump_json"):
+#            val = val.model_dump_json()
+#        return val
+    
+    def _toObject(self, val):
+        rval = val
         if isinstance(val, list):
-            val = '[' + ",".join(self._toString(v) for v in val) + ']'
-        elif hasattr(val, "model_dump_json"):
-            val = val.model_dump_json()
-        return val
+            rval = list(self._toObject(v) for v in val)
+        elif hasattr(val, "model_dump"):
+            rval = val.model_dump()
+
+        return rval
 
     def visitExprId(self, e : ExprId):
         if e.id in self.variables:
-            self.value = self.variables[e.id]
+            # Always represent data as a JSON object
+            self.value = self._toObject(self.variables[e.id])
         else:
             raise Exception("Variable '%s' not found" % e.id)
 

dv_flow/mgr/param.py

@@ -0,0 +1,20 @@
+
+from pydantic import BaseModel
+import pydantic.dataclasses as pdc
+from typing import Any, List, Union
+
+class ParamMeta(type):
+    def __getitem__(self, T):
+        ret = Union[T, Param]
+        return ret
+
+class ParamT(metaclass=ParamMeta):
+    pass
+
+class Param(BaseModel):
+    append : Union[Any,List] = pdc.Field(default=None)
+    prepend : Union[Any,List] = pdc.Field(default=None)
+    append_path : Union[Any,List] = pdc.Field(default=None, alias="append-path")
+    prepend_path : Union[Any,List] = pdc.Field(default=None, alias="prepend-path")
+
+

dv_flow/mgr/param_ref_eval.py

@@ -2,6 +2,7 @@ import dataclasses as dc
 import json
 from .expr_eval import ExprEval
 from .expr_parser import ExprParser
+from .eval_jq import eval_jq
 
 @dc.dataclass
 class ParamRefEval(object):
@@ -9,6 +10,9 @@ class ParamRefEval(object):
     parser : ExprParser = ExprParser()
     expr_eval : ExprEval = ExprEval()
 
+    def __post_init__(self):
+        self.expr_eval.methods["jq"] = eval_jq
+
     def eval(self, val : str) -> str:
         idx = 0
 
@@ -22,12 +26,9 @@ class ParamRefEval(object):
                     raise Exception("unterminated variable ref")
                 
                 ref = val[idx+3:eidx].strip()
-                print("ref: %s" % ref)
 
                 expr_ast = self.parser.parse(ref)
-                print("expr_ast: %s" % str(expr_ast))
                 exp_val = self.expr_eval.eval(expr_ast)
-                print("exp_val: %s" % str(exp_val))
 
                 # Replacing [idx..eidx+2] with len(exp_val)
                 val = val[:idx] + exp_val + val[eidx+2:]

dv_flow/mgr/task_node.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, ClassVar, Dict, List
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
 from .task_params_ctor import TaskParamsCtor
 from .param_ref_eval import ParamRefEval
+from .param import Param
 
 @dc.dataclass
 class TaskNode(object):
@@ -47,12 +48,17 @@ class TaskNode(object):
 
         for name,field in self.params.model_fields.items():
             value = getattr(self.params, name)
-            if value.find("${{") != -1:
-                new_val = eval.eval(value)
-                setattr(self.params, name, new_val)
-                print("TODO: expand")
-            print("Field: %s %s" % (name, str(value)))
-            pass
+            if type(value) == str:
+                if value.find("${{") != -1:
+                    new_val = eval.eval(value)
+                    setattr(self.params, name, new_val)
+            elif isinstance(value, list):
+                for i,elem in enumerate(value):
+                    if elem.find("${{") != -1:
+                        new_val = eval.eval(elem)
+                        value[i] = new_val
+            else:
+                raise Exception("Unhandled param type: %s" % str(value))
 
         input = TaskDataInput(
             changed=changed,
@@ -81,12 +87,6 @@ class TaskNode(object):
     def __hash__(self):
         return id(self)
     
-@staticmethod
-def task(paramT):
-    def wrapper(T):
-        ctor = TaskNodeCtorWrapper(T.__name__, T, paramT)
-        return ctor
-    return wrapper
 
 @dc.dataclass
 class TaskNodeCtor(object):
@@ -97,7 +97,6 @@ class TaskNodeCtor(object):
     """
     name : str
 
-
     def mkTaskNode(self, srcdir, params, name=None) -> TaskNode:
         raise NotImplementedError("mkTaskNode in type %s" % str(type(self)))
 
@@ -138,5 +137,25 @@ class TaskNodeCtorWrapper(TaskNodeCtor):
                     str(type(obj)),
                     key))
             else:
-                setattr(obj, key, value)
+                if isinstance(value, Param):
+                    if value.append is not None:
+                        ex_value = getattr(obj, key, [])
+                        ex_value.extend(value.append)
+                        setattr(obj, key, ex_value)
+                    elif value.prepend is not None:
+                        ex_value = getattr(obj, key, [])
+                        value = value.copy()
+                        value.extend(ex_value)
+                        setattr(obj, key, value)
+                        pass
+                    else:
+                        raise Exception("Unhandled value spec: %s" % str(value))
+                else:
+                    setattr(obj, key, value)
         return obj
+
+def task(paramT):
+    def wrapper(T):
+        ctor = TaskNodeCtorWrapper(T.__name__, T, paramT)
+        return ctor
+    return wrapper

{dv_flow_mgr-0.0.1.13525773676a1.dist-info → dv_flow_mgr-0.0.1.13577785562a1.dist-info}/METADATA

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

@@ -1,6 +1,7 @@
 dv_flow/mgr/__init__.py,sha256=IZA7I1u7RH34DrJXSkETxWFpK5Jn_A2zXfnCAzJ8XxA,289
 dv_flow/mgr/__main__.py,sha256=uik6gDAvtZNG0yyDKYc4FTl6R1QHAR543jNG2lCAa6E,1771
-dv_flow/mgr/expr_eval.py,sha256=M8qTIEnnbff8BCbxvNIztYyG-BJGSe_cLexfqYr3E0w,1807
+dv_flow/mgr/eval_jq.py,sha256=Ue-qkyNW6uOu2Wy8u6nrTbPPY7ujaHd0-4iki0eV3Ec,294
+dv_flow/mgr/expr_eval.py,sha256=Mp0TvrV6gZWcj1uYwLfPNI-ARwwdAfwntE5byLBfBuY,2276
 dv_flow/mgr/expr_parser.py,sha256=aR8n6hgk5xmFknIaSVC02K-So-eU4pkkFtwb7zWsSPs,5474
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
 dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
@@ -8,8 +9,9 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=878twhPD-E1pFlDNUtuyeFEgJ_Y89b560og4St-Iwrs,1679
 dv_flow/mgr/package_def.py,sha256=dwvs-7kGEp7wFrBK2Fybysb-vSKwtWOtxTrg1VIaL14,14975
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
+dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=e2WvRCMArbgcsKC4TKQqZTscZmCdo3WvVR6w3LN0VK8,727
-dv_flow/mgr/param_ref_eval.py,sha256=MLJNUgvvgxEPzr16vLPUvGwn9lHkKohr7xVAaZhU7Yk,1129
+dv_flow/mgr/param_ref_eval.py,sha256=dpV6IPdTtZHLy8maTsN61Ce1Cc5M5dLQW5sauNujEMU,1090
 dv_flow/mgr/parsetab.py,sha256=enSOnMQ-woIsMEzHyeYiefvhAl8enxfX9Ct_o8-jkqs,3780
 dv_flow/mgr/pkg_rgy.py,sha256=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
 dv_flow/mgr/task.py,sha256=kLQSvnVwj9ROIDtxq8lLu-4mJizTxOqvUeogmgN6QAA,5976
@@ -22,7 +24,7 @@ dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1Jip
 dv_flow/mgr/task_graph_runner_local.py,sha256=OrydPwtQ8E7hYWvSXx0h7lI3nfUNFyklULhsyMwz9dA,4687
 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_node.py,sha256=CTMfBzKR_kSs10sLxA0NC9HihqsOTHJ49k5oPfcZyNU,4192
+dv_flow/mgr/task_node.py,sha256=uCsyNT9IQu0cok27qTEi4iTB6FqobXbx7hbVAmjELKc,5130
 dv_flow/mgr/task_output.py,sha256=l-W-FvVo6YDah1RQS-I9N0KUtB3vp-kl7lxIdmNz0l4,178
 dv_flow/mgr/task_params_ctor.py,sha256=aXgB8o9xFPjaEjGW_xYkEC0N0apzGzGUPDj7g2ZLvus,1112
 dv_flow/mgr/task_runner.py,sha256=JmerE6CyXiJJK7-n6P65OzwW9UTYFQqV8Cck7eHe0B8,3882
@@ -35,9 +37,9 @@ dv_flow/mgr/std/fileset.py,sha256=uP7bGntRq-Tn5_GEFnt0_J_OAmfvep3GlCwCuE8by4o,27
 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.13525773676a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13525773676a1.dist-info/METADATA,sha256=Bg3ASctj2O6u1eTnAZ9_FKztQjpslQZC0fr7SCSqg6c,13276
-dv_flow_mgr-0.0.1.13525773676a1.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-dv_flow_mgr-0.0.1.13525773676a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13525773676a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13525773676a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/METADATA,sha256=UeJMpl2RnCOQX98UgtpVXI3qjSPhe4Zs_Gcg4-Cv4hE,13276
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13577785562a1.dist-info/RECORD,,

{dv_flow_mgr-0.0.1.13525773676a1.dist-info → dv_flow_mgr-0.0.1.13577785562a1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any