py2dag 0.3.4__tar.gz → 0.3.6__tar.gz

{py2dag-0.3.4 → py2dag-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: py2dag
-Version: 0.3.4
+Version: 0.3.6
 Summary: Convert Python function plans to DAG (JSON, pseudo, optional SVG).
 License: MIT
 Author: rvergis

{py2dag-0.3.4 → py2dag-0.3.6}/py2dag/parser.py

@@ -131,7 +131,7 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
                         return list(prev.get("deps", []))
                 return [ssa_var]
 
-            for arg in call.args:
+            for idx, arg in enumerate(call.args):
                 if isinstance(arg, ast.Starred):
                     star_val = arg.value
                     if isinstance(star_val, ast.Name):
@@ -156,7 +156,20 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
                         deps.append(_ssa_get(elt.id))
                         dep_labels.append("")
                 else:
-                    raise DSLParseError("Positional args must be variable names or lists/tuples of names")
+                    # Allow literal positional arguments by emitting a CONST node
+                    try:
+                        lit = _literal(arg)
+                    except DSLParseError:
+                        raise DSLParseError("Positional args must be variable names or lists/tuples of names or literals")
+                    const_id = _ssa_new(f"{var_name}_arg{idx}")
+                    ops.append({
+                        "id": const_id,
+                        "op": "CONST.value",
+                        "deps": [],
+                        "args": {"value": lit},
+                    })
+                    deps.append(const_id)
+                    dep_labels.append("")
 
             kwargs: Dict[str, Any] = {}
             for kw in call.keywords:
@@ -343,26 +356,7 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
                 sl = sl.value  # type: ignore[assignment]
             key = _literal(sl)
 
-            awaited = False
-            if isinstance(value, ast.Await):
-                value = value.value
-                awaited = True
-
-            # Determine SSA id for RHS value
-            if isinstance(value, ast.Call):
-                val_id = _emit_assign_from_call(f"{base.id}_item", value, awaited)
-            elif isinstance(value, ast.JoinedStr):
-                val_id = _emit_assign_from_fstring(f"{base.id}_item", value)
-            elif isinstance(value, (ast.Constant, ast.List, ast.Tuple, ast.Dict)):
-                val_id = _emit_assign_from_literal_or_pack(f"{base.id}_item", value)
-            elif isinstance(value, (ast.ListComp, ast.SetComp, ast.DictComp, ast.GeneratorExp)):
-                val_id = _emit_assign_from_comp(f"{base.id}_item", value)
-            elif isinstance(value, ast.Subscript):
-                val_id = _emit_assign_from_subscript(f"{base.id}_item", value)
-            elif isinstance(value, ast.Name):
-                val_id = _ssa_get(value.id)
-            else:
-                raise DSLParseError("Right hand side must be a call or f-string")
+            val_id = _emit_value(f"{base.id}_item", value)
 
             base_id = _ssa_get(base.id)
             ssa = _ssa_new(base.id)
@@ -381,6 +375,51 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
             ops.append({"id": ssa, "op": "COND.eval", "deps": deps, "args": {"expr": expr, "kind": kind}})
             return ssa
 
+        def _emit_assign_from_ifexp(var_name: str, node: ast.IfExp) -> str:
+            """Emit operations for an inline ``a if cond else b`` expression."""
+            cond_id = _emit_cond(node.test, kind="ifexp")
+
+            then_start = len(ops)
+            then_id = _emit_value(f"{var_name}_then", node.body)
+            if len(ops) > then_start:
+                first = ops[then_start]
+                deps0 = first.get("deps", []) or []
+                if cond_id not in deps0:
+                    first["deps"] = [*deps0, cond_id]
+
+            else_start = len(ops)
+            else_id = _emit_value(f"{var_name}_else", node.orelse)
+            if len(ops) > else_start:
+                first = ops[else_start]
+                deps0 = first.get("deps", []) or []
+                if cond_id not in deps0:
+                    first["deps"] = [*deps0, cond_id]
+
+            ssa = _ssa_new(var_name)
+            ops.append({"id": ssa, "op": "PHI", "deps": [then_id, else_id], "args": {"var": var_name}})
+            return ssa
+
+        def _emit_value(var_name: str, value: ast.AST) -> str:
+            awaited = False
+            if isinstance(value, ast.Await):
+                value = value.value
+                awaited = True
+            if isinstance(value, ast.Call):
+                return _emit_assign_from_call(var_name, value, awaited)
+            if isinstance(value, ast.JoinedStr):
+                return _emit_assign_from_fstring(var_name, value)
+            if isinstance(value, (ast.Constant, ast.List, ast.Tuple, ast.Dict)):
+                return _emit_assign_from_literal_or_pack(var_name, value)
+            if isinstance(value, (ast.ListComp, ast.SetComp, ast.DictComp, ast.GeneratorExp)):
+                return _emit_assign_from_comp(var_name, value)
+            if isinstance(value, ast.Subscript):
+                return _emit_assign_from_subscript(var_name, value)
+            if isinstance(value, ast.IfExp):
+                return _emit_assign_from_ifexp(var_name, value)
+            if isinstance(value, ast.Name):
+                return _ssa_get(value.id)
+            raise DSLParseError("Right hand side must be a call or f-string")
+
         def _emit_iter(node: ast.AST, target_label: Optional[str] = None) -> str:
             expr = _stringify(node)
             deps = [_ssa_get(n) for n in _collect_value_deps(node)]
@@ -399,23 +438,7 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
                 target = stmt.targets[0]
                 if isinstance(target, ast.Name):
                     var_name = target.id
-                    value = stmt.value
-                    awaited = False
-                    if isinstance(value, ast.Await):
-                        value = value.value
-                        awaited = True
-                    if isinstance(value, ast.Call):
-                        return _emit_assign_from_call(var_name, value, awaited)
-                    elif isinstance(value, ast.JoinedStr):
-                        return _emit_assign_from_fstring(var_name, value)
-                    elif isinstance(value, (ast.Constant, ast.List, ast.Tuple, ast.Dict)):
-                        return _emit_assign_from_literal_or_pack(var_name, value)
-                    elif isinstance(value, (ast.ListComp, ast.SetComp, ast.DictComp, ast.GeneratorExp)):
-                        return _emit_assign_from_comp(var_name, value)
-                    elif isinstance(value, ast.Subscript):
-                        return _emit_assign_from_subscript(var_name, value)
-                    else:
-                        raise DSLParseError("Right hand side must be a call or f-string")
+                    return _emit_value(var_name, stmt.value)
                 elif isinstance(target, ast.Subscript):
                     return _emit_assign_to_subscript(target, stmt.value)
                 else:
@@ -459,7 +482,18 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
                     ssa = _ssa_new("break")
                     ops.append({"id": ssa, "op": "CTRL.break", "deps": [], "args": {}})
                 if isinstance(stmt.value, ast.Name):
-                    returned_var = _ssa_get(stmt.value.id)
+                    name = stmt.value.id
+                    if name in latest:
+                        returned_var = _ssa_get(name)
+                    else:
+                        const_id = _ssa_new("return_value")
+                        ops.append({
+                            "id": const_id,
+                            "op": "CONST.value",
+                            "deps": [],
+                            "args": {"value": None},
+                        })
+                        returned_var = const_id
                 elif isinstance(stmt.value, (ast.Constant, ast.List, ast.Tuple, ast.Dict)):
                     lit = _literal(stmt.value)
                     const_id = _ssa_new("return_value")

{py2dag-0.3.4 → py2dag-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "py2dag"
-version = "0.3.4"
+version = "0.3.6"
 description = "Convert Python function plans to DAG (JSON, pseudo, optional SVG)."
 authors = ["rvergis"]
 license = "MIT"