dv-flow-mgr 0.0.1.13525773676a1__tar.gz → 0.0.1.13551739897a1__tar.gz

{dv_flow_mgr-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13525773676a1
+Version: 0.0.1.13551739897a1
 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 → dv_flow_mgr-0.0.1.13551739897a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.13525773676a1"
+version = "0.0.1.13551739897a1"
 dependencies = [
     'pydantic',
     'pyyaml',

dv_flow_mgr-0.0.1.13551739897a1/src/dv_flow/mgr/eval_jq.py

@@ -0,0 +1,15 @@
+
+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).all()
+    else:
+        ret = filt.input_value(input).all()
+
+    return ret

{dv_flow_mgr-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/src/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,27 @@ class ExprEval(ExprVisitor):
         return val
     
     def _toString(self, val):
+        obj = self._toObject(val)
+        return json.dumps(obj)
+#        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-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/src/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
 

{dv_flow_mgr-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/src/dv_flow/mgr/task_node.py

@@ -45,13 +45,15 @@ class TaskNode(object):
 
         eval.setVar("in", in_params)
 
+#        for attr in dir(self.params):
+#            if not attr.startswith("_"):
+#                print("Attr: %s" % attr)
         for name,field in self.params.model_fields.items():
             value = getattr(self.params, name)
+            print("Field: %s %s" % (name, str(value)))
             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
 
         input = TaskDataInput(

{dv_flow_mgr-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13525773676a1
+Version: 0.0.1.13551739897a1
 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 → dv_flow_mgr-0.0.1.13551739897a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ docs/quickstart.rst
 docs/reference.rst
 src/dv_flow/mgr/__init__.py
 src/dv_flow/mgr/__main__.py
+src/dv_flow/mgr/eval_jq.py
 src/dv_flow/mgr/expr_eval.py
 src/dv_flow/mgr/expr_parser.py
 src/dv_flow/mgr/fileset.py

{dv_flow_mgr-0.0.1.13525773676a1 → dv_flow_mgr-0.0.1.13551739897a1}/tests/unit/test_pytask_smoke.py

@@ -130,7 +130,7 @@ def test_smoke_4(tmpdir):
     task1 = MyTask1("srcdir", p1="1")
     task2 = MyTask2("srcdir", p1="2")
     task3 = MyTask3("srcdir", 
-                    p1="${{ in }}", 
+                    p1="${{ in | jq('.[] .val') }}", 
                     needs=[task1, task2])
     runner = TaskSetRunner("rundir")
 
@@ -138,4 +138,4 @@ def test_smoke_4(tmpdir):
 
     assert len(called) == 3
     assert called[-1][0] == "MyTask3"
-    assert called[-1][1] == "3"
+    assert called[-1][1] == "[1, 2]"