dv-flow-mgr 0.0.1.13335470340a1__tar.gz → 0.0.1.13468776985a1__tar.gz

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13335470340a1
+Version: 0.0.1.13468776985a1
 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.13468776985a1/docs/RundirLayout.md

@@ -0,0 +1,9 @@
+
+rundir/
+  - info/
+    - task-execution database
+    - execution logs
+  - tasks/
+    - per-task execution directory
+    - only for tasks that require persistent outputs
+

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/docs/Steps.md

@@ -40,6 +40,7 @@ Result Data
   - changed
   - memento
   - list of markers
+  - exit status (?)
 - Saves memento and markers for later inspection (central dir?)
 - Sets 'self' as source of parameter sets
 - Forms output data from
@@ -47,4 +48,21 @@ Result Data
   - list of parameter sets
 
 # Creating Task Parameters
+- 
+
+# Need execution support for tasks
+- Create parameters given the current inputs
+  - Need to follow inheritance
+  - Last (bottom-up) "value" wins
+  - Appends act bottom-up
+
+- Task holds handles to input data from dependencies
+  - 
+  - Make Task as simple as possible: scheduling item and place to store data
+
+- Something needs to prepare inputs (likely runner)
+  - Locate 
+- Something needs to process result
+  - Save memento in central store (map of task-execution records)
+    - Organize with start/finish times, etc
 - 

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/ivpm.yaml

@@ -27,5 +27,7 @@ package:
       src: pypi
     - name: jq
       src: pypi
+    - name: ply
+      src: pypi
 
 

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/pyproject.toml

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

dv_flow_mgr-0.0.1.13468776985a1/src/dv_flow/mgr/expr_eval.py

@@ -0,0 +1,50 @@
+
+import dataclasses as dc
+from typing import Any, Callable, Dict, List
+from .expr_parser import ExprVisitor, Expr, ExprBin, ExprBinOp, ExprCall, ExprId, ExprString, ExprInt
+
+@dc.dataclass
+class ExprEval(ExprVisitor):
+    methods : Dict[str, Callable] = dc.field(default_factory=dict)
+    variables : Dict[str, object] = dc.field(default_factory=dict)
+    value : Any = None
+
+    def eval(self, e : Expr):
+        self.value = None
+        e.accept(self)
+        return self.value
+
+    def visitExprId(self, e : ExprId):
+        if e.id in self.variables:
+            self.value = self.variables[e.id]
+        else:
+            raise Exception("Variable %s not found" % e.id)
+
+    def visitExprString(self, e : ExprString):
+        self.value = e.value
+    
+    def visitExprBin(self, e):
+        e.lhs.accept(self)
+
+        if e.op == ExprBinOp.Pipe:
+            # Value just goes over to the rhs
+            e.rhs.accept(self)
+        elif e.op == ExprBinOp.Plus:
+            pass
+    
+    def visitExprCall(self, e : ExprCall):
+        if e.id in self.methods:
+            # Need to gather up argument values
+            in_value = self.value
+            args = []
+            for arg in e.args:
+                self.value = None
+                arg.accept(self)
+                args.append(self.value)
+
+            self.value = self.methods[e.id](in_value, args)
+        else:
+            raise Exception("Method %s not found" % e.id)
+        
+    def visitExprInt(self, e : ExprInt):
+        self.value = e.value

dv_flow_mgr-0.0.1.13468776985a1/src/dv_flow/mgr/expr_parser.py

@@ -0,0 +1,233 @@
+import dataclasses as dc
+import enum
+import ply.lex as lex
+import ply.yacc as yacc
+from typing import ClassVar, List
+
+@dc.dataclass
+class Expr(object):
+    def accept(self, v):
+        raise NotImplementedError("Expr.accept for %s" % str(type(sepf)))
+
+@dc.dataclass
+class ExprId(Expr):
+    id : str
+
+    def accept(self, v):
+        v.visitExprId(self)
+
+class ExprBinOp(enum.Enum):
+    Pipe = enum.auto()
+    Plus = enum.auto()
+    Minus = enum.auto()
+    Times = enum.auto()
+    Divide = enum.auto()
+
+@dc.dataclass
+class ExprBin(Expr):
+    op : ExprBinOp
+    lhs : Expr
+    rhs : Expr
+
+    def accept(self, v):
+        v.visitExprBin(self)
+
+@dc.dataclass
+class ExprCall(Expr):
+    id : str
+    args : List[Expr]
+
+    def accept(self, v):
+        v.visitExprCall(self)
+
+@dc.dataclass
+class ExprString(Expr):
+    value : str
+
+    def accept(self, v):
+        v.visitExprString(self)
+
+@dc.dataclass
+class ExprInt(Expr):
+    value : int
+
+    def accept(self, v):
+        v.visitExprInt(self)
+
+class ExprVisitor(object):
+    def visitExprId(self, e : ExprId):
+        pass
+
+    def visitExprBin(self, e : ExprBin):
+        e.lhs.accept(self)
+        e.rhs.accept(self)
+
+    def visitExprCall(self, e : ExprCall):
+        for arg in e.args:
+            arg.accept(self)
+
+    def visitExprString(self, e : ExprString):
+        pass
+
+    def visitExprInt(self, e : ExprInt):
+        pass
+
+@dc.dataclass
+class ExprVisitor2String(ExprVisitor):
+    _ret : str = ""
+    _idx : int = 0
+
+    @staticmethod
+    def toString(e : Expr):
+        v = ExprVisitor2String()
+        e.accept(v)
+        return v._ret
+
+    def visitExprId(self, e : ExprId):
+        self._ret += e.id
+    
+    def visitExprBin(self, e):
+        e.lhs.accept(self)
+        self._ret += " "
+        self._ret += "op%d" % self._idx
+        self._idx += 1
+        self._ret += " "
+        e.rhs.accept(self)
+
+    def visitExprCall(self, e):
+        self._ret += e.id
+        self._ret += "("
+        for i, arg in enumerate(e.args):
+            if i > 0:
+                self._ret += ", "
+            arg.accept(self)
+        self._ret += ")"
+    
+    def visitExprString(self, e):
+        self._ret += e.value
+
+    def visitExprInt(self, e):
+        self._ret += str(e.value)
+
+
+class ExprParser(object):
+
+    _inst : ClassVar['ExprParser'] = None
+
+    def __init__(self):
+
+        # Build the lexer
+        self.lexer = lex.lex(module=self)
+        self.parser = yacc.yacc(module=self)
+
+    @classmethod
+    def inst(cls):
+        if cls._inst is None:
+            cls._inst = ExprParser()
+        return cls._inst
+
+    tokens = (
+        'ID','NUMBER','COMMA',
+        'PLUS','MINUS','TIMES','DIVIDE',
+        'LPAREN','RPAREN','PIPE','STRING1','STRING2'
+        )
+    
+    # Tokens
+
+    t_COMMA   = r',' 
+    t_PLUS    = r'\+'
+    t_MINUS   = r'-'
+    t_TIMES   = r'\*'
+    t_DIVIDE  = r'/'
+    t_LPAREN  = r'\('
+    t_RPAREN  = r'\)'
+    t_ID      = r'[a-zA-Z_][a-zA-Z0-9_]*'
+    t_PIPE    = r'\|'
+    t_STRING2 = r'\'.*\''
+    
+    def t_NUMBER(self, t):
+        r'\d+'
+        try:
+            t.value = ExprInt(int(t.value)) 
+        except ValueError:
+            print("Integer value too large %d", t.value)
+            t.value = ExprInt(0)
+        return t
+    
+    def t_STRING1(self, t):
+        r'(\'|\")([^\\\n]|(\\.))*?(\'|\")'
+        t.value = t.value[1:-1].replace('\\"', '"').replace("\\'", "'").replace('\\n', '\n').replace('\\t', '\t').replace('\\\\', '\\')
+        return t
+    
+    # Ignored characters
+    t_ignore = " \t"
+    
+    def t_newline(self, t):
+        r'\n+'
+        t.lexer.lineno += t.value.count("\n")
+        
+    def t_error(self, t):
+        print("Illegal character '%s'" % t.value[0])
+        t.lexer.skip(1)
+        
+    precedence = (
+        ('left','PLUS','MINUS','PIPE'),
+        ('left','TIMES','DIVIDE'),
+#        ('right','UMINUS'),
+        )
+    
+    def p_call(self, t):
+        """expression : ID LPAREN RPAREN 
+                      | ID LPAREN args RPAREN"""
+        t[0] = ExprCall(t[1], t[3] if len(t) == 5 else [])
+
+    def p_args(self, t):
+        """args : expression 
+                | args COMMA expression"""
+        if len(t) == 2:
+            t[0] = [t[1]]
+        else:
+            t[0] = t[1]
+            t[0].append(t[3])
+    
+    def p_expression_binop(self, t):
+        '''expression : expression PLUS expression
+                      | expression MINUS expression
+                      | expression TIMES expression
+                      | expression PIPE expression
+                      | expression DIVIDE expression'''
+        op_m = {
+            '+' : ExprBinOp.Plus,
+            '-' : ExprBinOp.Minus,
+            '*' : ExprBinOp.Times,
+            '|' : ExprBinOp.Pipe,
+            '/' : ExprBinOp.Divide
+        }
+        t[0] = ExprBin(op_m[t[2]], t[1], t[3])
+    
+    def p_expression_group(self, t):
+        'expression : LPAREN expression RPAREN'
+        t[0] = t[2]
+    
+    def p_expression_number(self, t):
+        'expression : NUMBER'
+        t[0] = t[1]
+    
+    def p_expression_name(self, t):
+        'expression : ID'
+        t[0] = ExprId(t[1])
+
+    def p_expression_string1(self, t):
+        'expression : STRING1'
+        t[0] = ExprString(t[1])
+
+    def p_expression_string2(self, t):
+        'expression : STRING2'
+        t[0] = ExprString(t[1])
+    
+    def p_error(self, t):
+        print("Syntax error at '%s'" % t.value)
+
+    def parse(self, input):
+        return self.parser.parse(input, lexer=self.lexer)
+    

dv_flow_mgr-0.0.1.13468776985a1/src/dv_flow/mgr/parsetab.py

@@ -0,0 +1,44 @@
+
+# parsetab.py
+# This file is automatically generated. Do not edit.
+# pylint: disable=W,C,R
+_tabversion = '3.10'
+
+_lr_method = 'LALR'
+
+_lr_signature = 'leftPLUSMINUSPIPEleftTIMESDIVIDECOMMA DIVIDE ID LPAREN MINUS NUMBER PIPE PLUS RPAREN STRING1 STRING2 TIMESexpression : ID LPAREN RPAREN \n                      | ID LPAREN args RPARENargs : expression \n                | args COMMA expressionexpression : expression PLUS expression\n                      | expression MINUS expression\n                      | expression TIMES expression\n                      | expression PIPE expression\n                      | expression DIVIDE expressionexpression : LPAREN expression RPARENexpression : NUMBERexpression : IDexpression : STRING1expression : STRING2'
+    
+_lr_action_items = {'ID':([0,3,7,8,9,10,11,12,24,],[2,2,2,2,2,2,2,2,2,]),'LPAREN':([0,2,3,7,8,9,10,11,12,24,],[3,12,3,3,3,3,3,3,3,3,]),'NUMBER':([0,3,7,8,9,10,11,12,24,],[4,4,4,4,4,4,4,4,4,]),'STRING1':([0,3,7,8,9,10,11,12,24,],[5,5,5,5,5,5,5,5,5,]),'STRING2':([0,3,7,8,9,10,11,12,24,],[6,6,6,6,6,6,6,6,6,]),'$end':([1,2,4,5,6,14,15,16,17,18,19,22,23,],[0,-12,-11,-13,-14,-5,-6,-7,-8,-9,-1,-10,-2,]),'PLUS':([1,2,4,5,6,13,14,15,16,17,18,19,21,22,23,25,],[7,-12,-11,-13,-14,7,-5,-6,-7,-8,-9,-1,7,-10,-2,7,]),'MINUS':([1,2,4,5,6,13,14,15,16,17,18,19,21,22,23,25,],[8,-12,-11,-13,-14,8,-5,-6,-7,-8,-9,-1,8,-10,-2,8,]),'TIMES':([1,2,4,5,6,13,14,15,16,17,18,19,21,22,23,25,],[9,-12,-11,-13,-14,9,9,9,-7,9,-9,-1,9,-10,-2,9,]),'PIPE':([1,2,4,5,6,13,14,15,16,17,18,19,21,22,23,25,],[10,-12,-11,-13,-14,10,-5,-6,-7,-8,-9,-1,10,-10,-2,10,]),'DIVIDE':([1,2,4,5,6,13,14,15,16,17,18,19,21,22,23,25,],[11,-12,-11,-13,-14,11,11,11,-7,11,-9,-1,11,-10,-2,11,]),'RPAREN':([2,4,5,6,12,13,14,15,16,17,18,19,20,21,22,23,25,],[-12,-11,-13,-14,19,22,-5,-6,-7,-8,-9,-1,23,-3,-10,-2,-4,]),'COMMA':([2,4,5,6,14,15,16,17,18,19,20,21,22,23,25,],[-12,-11,-13,-14,-5,-6,-7,-8,-9,-1,24,-3,-10,-2,-4,]),}
+
+_lr_action = {}
+for _k, _v in _lr_action_items.items():
+   for _x,_y in zip(_v[0],_v[1]):
+      if not _x in _lr_action:  _lr_action[_x] = {}
+      _lr_action[_x][_k] = _y
+del _lr_action_items
+
+_lr_goto_items = {'expression':([0,3,7,8,9,10,11,12,24,],[1,13,14,15,16,17,18,21,25,]),'args':([12,],[20,]),}
+
+_lr_goto = {}
+for _k, _v in _lr_goto_items.items():
+   for _x, _y in zip(_v[0], _v[1]):
+       if not _x in _lr_goto: _lr_goto[_x] = {}
+       _lr_goto[_x][_k] = _y
+del _lr_goto_items
+_lr_productions = [
+  ("S' -> expression","S'",1,None,None,None),
+  ('expression -> ID LPAREN RPAREN','expression',3,'p_call','expr_parser.py',160),
+  ('expression -> ID LPAREN args RPAREN','expression',4,'p_call','expr_parser.py',161),
+  ('args -> expression','args',1,'p_args','expr_parser.py',165),
+  ('args -> args COMMA expression','args',3,'p_args','expr_parser.py',166),
+  ('expression -> expression PLUS expression','expression',3,'p_expression_binop','expr_parser.py',174),
+  ('expression -> expression MINUS expression','expression',3,'p_expression_binop','expr_parser.py',175),
+  ('expression -> expression TIMES expression','expression',3,'p_expression_binop','expr_parser.py',176),
+  ('expression -> expression PIPE expression','expression',3,'p_expression_binop','expr_parser.py',177),
+  ('expression -> expression DIVIDE expression','expression',3,'p_expression_binop','expr_parser.py',178),
+  ('expression -> LPAREN expression RPAREN','expression',3,'p_expression_group','expr_parser.py',189),
+  ('expression -> NUMBER','expression',1,'p_expression_number','expr_parser.py',193),
+  ('expression -> ID','expression',1,'p_expression_name','expr_parser.py',197),
+  ('expression -> STRING1','expression',1,'p_expression_string1','expr_parser.py',201),
+  ('expression -> STRING2','expression',1,'p_expression_string2','expr_parser.py',205),
+]

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/src/dv_flow/mgr/task.py

@@ -25,7 +25,7 @@ import dataclasses as dc
 import logging
 from pydantic import BaseModel
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
-from .task_data import TaskData
+from .task_data import TaskData, TaskDataInput, TaskDataOutput, TaskDataResult
 from .task_memento import TaskMemento
 
 @dc.dataclass
@@ -180,112 +180,21 @@ class TaskCtorProxy(TaskCtor):
 class Task(object):
     """Executable view of a task"""
     name : str
-    params : TaskParams
-    srcdir : str = None
-    session : 'TaskGraphRunner' = None
-    basedir : str = None
-    memento : TaskMemento = None
-    depends : List['Task'] = dc.field(default_factory=list)
-    output : Any = None
-
-    # Implementation data below
-    basedir : str = dc.field(default=None)
-    rundir : str = dc.field(default=None)
-    impl : str = None
-    body: Dict[str,Any] = dc.field(default_factory=dict)
-    impl_t : Any = None
-
-    _log : ClassVar = logging.getLogger("Task")
-
-    def init(self, runner, basedir):
-        self.session = runner
-        self.basedir = basedir
-
-    def getMemento(self, T) -> TaskMemento:
-        if os.path.isfile(os.path.join(self.rundir, "memento.json")):
-            with open(os.path.join(self.rundir, "memento.json"), "r") as fp:
-                try:
-                    data = json.load(fp)
-                    self.memento = T(**data)
-                except Exception as e:
-                    self._log.critical("Failed to load memento %s: %s" % (
-                        os.path.join(self.rundir, "memento.json"), str(e)))
-                    os.unlink(os.path.join(self.rundir, "memento.json"))
-        return self.memento
-
-    def setMemento(self, memento : TaskMemento):
-        self.memento = memento
-
-    async def isUpToDate(self, memento) -> bool:
-        return False
-
-    async def do_run(self, session) -> TaskData:
-        self._log.info("--> %s (%s) do_run - %d depends" % (
-            self.name, 
-            str(type(self)),
-            len(self.depends)))
-
-        self.session = session
-
-        if len(self.depends) > 0:
-            deps_o = []
-            for d in self.depends:
-                dep_o = d.getOutput()
-                if dep_o is None:
-                    raise Exception("Null output for %s" % d.name)
-                deps_o.append(dep_o)
-
-            input = TaskData.merge(deps_o)
-            input.src = self.name
-            input.deps[self.name] = list(inp.name for inp in self.depends)
-        else:
-            input = TaskData()
-
-
-        # Mark the source of this data as being this task
-        input.src = self.name
-
-        self.init_rundir()
 
-        self.output = await self.run(input)
+    # Need TaskDef 
 
-        if self.output is None:
-            raise Exception("No output produced by %s" % self.name)
-            result = TaskData()
-
-        # Write-back the memento, if specified
-        self.save_memento()
+    params : TaskParams # Might need to be set of instructions for building...
+    # This needs to be 'inside out' -- listed bottom to top
+    srcdir : str = dc.field(default=None)
+    rundir : str = dc.field(default=None)
+    depends    : List['Task'] = dc.field(default_factory=list)
+    dependents : List['Task'] = dc.field(default_factory=list)
+    output : TaskDataOutput = dc.field(default=None)
 
-        # Combine data from the deps to produce a result
-        self._log.info("<-- %s (%s) do_run - %d depends" % (
-            self.name, 
-            str(type(self)),
-            len(self.depends)))
-        return self.output
+    _log : ClassVar = logging.getLogger("Task")
 
-    async def run(self, input : TaskData) -> TaskData:
+    async def run(self, 
+                  input : TaskDataInput,
+                  runner : 'TaskGraphRunner') -> TaskDataResult:
         raise NotImplementedError("TaskImpl.run() not implemented")
-    
-    def init_rundir(self):
-        if not os.path.isdir(self.rundir):
-            os.makedirs(self.rundir)
-
-    def save_memento(self):
-        if self.memento is not None:
-            with open(os.path.join(self.rundir, "memento.json"), "w") as fp:
-                fp.write(self.memento.model_dump_json(indent=2))
-    
-    def getOutput(self) -> TaskData:
-        return self.output
-
-    def getField(self, name : str) -> Any:
-        if name in self.__dict__.keys():
-            return self.__dict__[name]
-        elif name in self.__pydantic_extra__.keys():
-            return self.__pydantic_extra__[name]
-        else:
-            raise Exception("No such field %s" % name)
-        
-
-
 

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/src/dv_flow/mgr/task_data.py

@@ -27,6 +27,24 @@ from typing import Any, ClassVar, Dict, Set, List, Tuple
 from .fileset import FileSet
 from toposort import toposort
 
+class TaskDataInput(BaseModel):
+    changed : bool
+    srcdir : str
+    rundir : str
+    params : Any
+    memento : Any
+
+class TaskDataResult(BaseModel):
+    changed : bool
+    output : List[Any]
+    memento : Any
+    markers : List[Any]
+    status : int
+
+class TaskDataOutput(BaseModel):
+    changed : bool
+    output : List[Any]
+
 class TaskDataParamOpE(enum.Enum):
     Set = enum.auto()
     Append = enum.auto()

dv_flow_mgr-0.0.1.13468776985a1/src/dv_flow/mgr/task_exec_data.py

@@ -0,0 +1,22 @@
+import pydantic.dataclasses as dc
+from pydantic import BaseModel
+from typing import Any, Dict, List
+
+
+class TaskExecData(BaseModel):
+    """Data from a single exection of a task"""
+    name : str
+    start : str
+    finish : str
+    status : int
+    memento : Any
+    markers : List[Any]
+
+class FlowExecData(BaseModel):
+    """
+    Data from multiple tasks executions. 'info' holds information
+    across multiple flow invocations. 'tasks' holds the names of
+    tasks executed in the most-recent invocation.
+    """
+    info : Dict[str, TaskExecData] = dc.Field(default_factory=dict)
+    tasks : List[str] = dc.Field(default_factory=list)

{dv_flow_mgr-0.0.1.13335470340a1 → dv_flow_mgr-0.0.1.13468776985a1}/src/dv_flow_mgr.egg-info/PKG-INFO

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

@@ -9,6 +9,7 @@ docs/KeyArchitecture.md
 docs/Makefile
 docs/Notes.md
 docs/Roadmap.md
+docs/RundirLayout.md
 docs/Stages.md
 docs/Steps.md
 docs/TypesAndDefs.md
@@ -20,6 +21,7 @@ docs/quickstart.rst
 docs/reference.rst
 src/dv_flow/mgr/__init__.py
 src/dv_flow/mgr/__main__.py
+src/dv_flow/mgr/expr_eval.py
 src/dv_flow/mgr/expr_parser.py
 src/dv_flow/mgr/fileset.py
 src/dv_flow/mgr/fragment_def.py
@@ -28,10 +30,12 @@ src/dv_flow/mgr/package.py
 src/dv_flow/mgr/package_def.py
 src/dv_flow/mgr/package_import_spec.py
 src/dv_flow/mgr/param_def.py
+src/dv_flow/mgr/parsetab.py
 src/dv_flow/mgr/pkg_rgy.py
 src/dv_flow/mgr/task.py
 src/dv_flow/mgr/task_data.py
 src/dv_flow/mgr/task_def.py
+src/dv_flow/mgr/task_exec_data.py
 src/dv_flow/mgr/task_graph_builder.py
 src/dv_flow/mgr/task_graph_runner.py
 src/dv_flow/mgr/task_graph_runner_local.py
@@ -59,6 +63,8 @@ tests/system/test_pkg_discovery.py
 tests/system/test_stdlib.py
 tests/unit/__init__.py
 tests/unit/test_data_merge.py
+tests/unit/test_expr_eval.py
+tests/unit/test_expr_parser.py
 tests/unit/test_fileset.py
 tests/unit/test_parse.py
 tests/unit/test_pyclass.py

dv_flow_mgr-0.0.1.13468776985a1/tests/unit/test_expr_eval.py

@@ -0,0 +1,25 @@
+
+import pytest
+from dv_flow.mgr.expr_parser import ExprParser, ExprVisitor2String
+from dv_flow.mgr.expr_eval import ExprEval
+
+def test_smoke():
+    content = "sum(1, 2, 3, 4)"
+
+    def sum(in_value, args):
+        ret = 0
+        for arg in args:
+            ret += int(arg)
+        return ret
+    
+    eval = ExprEval()
+    eval.methods["sum"] = sum
+
+    parser = ExprParser()
+    expr = parser.parse(content)
+    result = eval.eval(expr)
+
+    assert result == 10
+
+
+

dv_flow_mgr-0.0.1.13468776985a1/tests/unit/test_expr_parser.py

@@ -0,0 +1,16 @@
+import pytest
+from dv_flow.mgr.expr_parser import ExprParser, ExprVisitor2String
+
+
+def test_smoke():
+#    content = "in | jq('.[] | select(.name == \"foo\")') | out"
+    content = "in | jq(\".[] | select()\") | out(a, b) | out()"
+
+    parser = ExprParser()
+    expr = parser.parse(content)
+    print("Expr: %s" % ExprVisitor2String.toString(expr))
+
+    expr = parser.parse(content)
+    print("Expr: %s" % ExprVisitor2String.toString(expr))
+
+

dv_flow_mgr-0.0.1.13335470340a1/src/dv_flow/mgr/expr_parser.py

@@ -1,38 +0,0 @@
-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