py2dag 0.3.6__tar.gz → 0.3.8__tar.gz

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

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

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

@@ -14,6 +14,20 @@ def _literal(node: ast.AST) -> Any:
     """Return a Python literal from an AST node or raise DSLParseError."""
     if isinstance(node, ast.Constant):
         return node.value
+    if isinstance(node, ast.JoinedStr):
+        parts: List[str] = []
+        for value in node.values:
+            if isinstance(value, ast.Constant):
+                parts.append(str(value.value))
+            elif isinstance(value, ast.FormattedValue):
+                try:
+                    expr = ast.unparse(value.value)  # type: ignore[attr-defined]
+                except Exception:
+                    expr = "?"
+                parts.append("{" + expr + "}")
+            else:
+                raise DSLParseError("Keyword argument values must be JSON-serialisable literals")
+        return "".join(parts)
     if isinstance(node, (ast.List, ast.Tuple)):
         return [_literal(elt) for elt in node.elts]
     if isinstance(node, ast.Dict):
@@ -722,11 +736,28 @@ def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
         for stmt in body:
             _parse_stmt(stmt)
 
+        # If no explicit return was encountered, emit a terminal break node so
+        # that the plan represents function completion.
+        break_id: Optional[str] = None
+        if returned_var is None:
+            break_id = _ssa_new("break")
+            ops.append({"id": break_id, "op": "CTRL.break", "deps": [], "args": {}})
+
+        # If no outputs were produced, synthesise a default return of `None` so
+        # that parsing succeeds for empty functions.
+        if returned_var is None and not outputs:
+            const_id = _ssa_new("return_value")
+            ops.append({
+                "id": const_id,
+                "op": "CONST.value",
+                "deps": [],
+                "args": {"value": None},
+            })
+            returned_var = const_id
+
         if not outputs:
-            if returned_var is not None:
-                outputs.append({"from": returned_var, "as": "return"})
-            else:
-                raise DSLParseError("At least one output() call required")
+            outputs.append({"from": returned_var if returned_var is not None else break_id, "as": "return"})
+
         if len(ops) > 2000:
             raise DSLParseError("Too many operations")
 

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

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