py2dag 0.1.4__tar.gz → 0.1.6__tar.gz

{py2dag-0.1.4 → py2dag-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: py2dag
-Version: 0.1.4
+Version: 0.1.6
 Summary: Convert Python function plans to DAG (JSON, pseudo, optional SVG).
 License: MIT
 Author: rvergis
@@ -76,6 +76,8 @@ poetry run python cli.py path/to/your_file.py --html
 
 This generates `plan.json`, `plan.pseudo`, and if `--html` is used, `plan.html`.
 
+- Function name: By default the tool auto-detects a suitable function in the file. To target a specific function, pass `--func NAME`.
+
 ### Offline HTML (no internet)
 
 `plan.html` references d3 and dagre-d3 from CDNs. To view graphs fully offline, download those files and place them next to `plan.html`, then edit the two `<script>` tags in `py2dag/export_dagre.py` to point at your local copies.
@@ -111,18 +113,17 @@ This repo includes a GitHub Actions workflow that publishes to PyPI when you pus
 
 1) In GitHub repo settings, add a repository secret named `PYPI_API_TOKEN` with your PyPI token (format: `pypi-***`).
 
-2) Bump patch version, create tag, and push it (this triggers the workflow):
+2) Bump patch version, commit, and tag locally; then push tags to trigger the workflow:
 
 ```
-make release
+make patch        # bumps version, commits, and tags vX.Y.Z
+make release      # pushes tags to GitHub (triggers publish)
 ```
 
-Or do individual steps:
+Or push tags manually:
 
 ```
-make bump-patch
-make tag
-make push-tags
+git push --tags
 ```
 
 You can also install from the local build with `pip install dist/*.whl`.

{py2dag-0.1.4 → py2dag-0.1.6}/README.md

@@ -57,6 +57,8 @@ poetry run python cli.py path/to/your_file.py --html
 
 This generates `plan.json`, `plan.pseudo`, and if `--html` is used, `plan.html`.
 
+- Function name: By default the tool auto-detects a suitable function in the file. To target a specific function, pass `--func NAME`.
+
 ### Offline HTML (no internet)
 
 `plan.html` references d3 and dagre-d3 from CDNs. To view graphs fully offline, download those files and place them next to `plan.html`, then edit the two `<script>` tags in `py2dag/export_dagre.py` to point at your local copies.
@@ -92,18 +94,17 @@ This repo includes a GitHub Actions workflow that publishes to PyPI when you pus
 
 1) In GitHub repo settings, add a repository secret named `PYPI_API_TOKEN` with your PyPI token (format: `pypi-***`).
 
-2) Bump patch version, create tag, and push it (this triggers the workflow):
+2) Bump patch version, commit, and tag locally; then push tags to trigger the workflow:
 
 ```
-make release
+make patch        # bumps version, commits, and tags vX.Y.Z
+make release      # pushes tags to GitHub (triggers publish)
 ```
 
-Or do individual steps:
+Or push tags manually:
 
 ```
-make bump-patch
-make tag
-make push-tags
+git push --tags
 ```
 
 You can also install from the local build with `pip install dist/*.whl`.

{py2dag-0.1.4 → py2dag-0.1.6}/py2dag/cli.py

@@ -9,7 +9,7 @@ from . import export_svg
 def main() -> None:
     ap = argparse.ArgumentParser(description="Convert Python function plan to DAG")
     ap.add_argument("file", help="Python file containing the plan function")
-    ap.add_argument("--func", default="plan", help="Function name to parse")
+    ap.add_argument("--func", default=None, help="Function name to parse (auto-detect if omitted)")
     ap.add_argument("--svg", action="store_true", help="Also export plan.svg via Graphviz (requires dot)")
     ap.add_argument("--html", action="store_true", help="Also export plan.html via Dagre (no system deps)")
     args = ap.parse_args()

py2dag-0.1.6/py2dag/parser.py

@@ -0,0 +1,211 @@
+import ast
+import json
+import re
+from typing import Any, Dict, List, Optional
+
+VALID_NAME_RE = re.compile(r'^[a-z_][a-z0-9_]{0,63}$')
+
+
+class DSLParseError(Exception):
+    """Raised when the mini-DSL constraints are violated."""
+
+
+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.List, ast.Tuple)):
+        return [_literal(elt) for elt in node.elts]
+    if isinstance(node, ast.Dict):
+        return {_literal(k): _literal(v) for k, v in zip(node.keys, node.values)}
+    raise DSLParseError("Keyword argument values must be JSON-serialisable literals")
+
+
+def _get_call_name(func: ast.AST) -> str:
+    if isinstance(func, ast.Name):
+        return func.id
+    if isinstance(func, ast.Attribute):
+        parts: List[str] = []
+        while isinstance(func, ast.Attribute):
+            parts.append(func.attr)
+            func = func.value
+        if isinstance(func, ast.Name):
+            parts.append(func.id)
+            return ".".join(reversed(parts))
+    raise DSLParseError("Only simple or attribute names are allowed for operations")
+
+
+def parse(source: str, function_name: Optional[str] = None) -> Dict[str, Any]:
+    if len(source) > 20_000:
+        raise DSLParseError("Source too large")
+    module = ast.parse(source)
+
+    def _parse_fn(fn: ast.AST) -> Dict[str, Any]:
+        defined: set[str] = set()
+        ops: List[Dict[str, Any]] = []
+        outputs: List[Dict[str, str]] = []
+        settings: Dict[str, Any] = {}
+
+        returned_var: Optional[str] = None
+        # type: ignore[attr-defined]
+        for i, stmt in enumerate(fn.body):  # type: ignore[attr-defined]
+            if isinstance(stmt, ast.Assign):
+                if len(stmt.targets) != 1 or not isinstance(stmt.targets[0], ast.Name):
+                    raise DSLParseError("Assignment targets must be simple names")
+                var_name = stmt.targets[0].id
+                if not VALID_NAME_RE.match(var_name):
+                    raise DSLParseError(f"Invalid variable name: {var_name}")
+                if var_name in defined:
+                    raise DSLParseError(f"Duplicate variable name: {var_name}")
+
+                value = stmt.value
+                if isinstance(value, ast.Await):
+                    value = value.value
+                if isinstance(value, ast.Call):
+                    op_name = _get_call_name(value.func)
+
+                    deps: List[str] = []
+                    for arg in value.args:
+                        if not isinstance(arg, ast.Name):
+                            raise DSLParseError("Positional args must be variable names")
+                        if arg.id not in defined:
+                            raise DSLParseError(f"Undefined dependency: {arg.id}")
+                        deps.append(arg.id)
+
+                    kwargs: Dict[str, Any] = {}
+                    for kw in value.keywords:
+                        if kw.arg is None:
+                            raise DSLParseError("**kwargs are not allowed")
+                        kwargs[kw.arg] = _literal(kw.value)
+
+                    ops.append({"id": var_name, "op": op_name, "deps": deps, "args": kwargs})
+                elif isinstance(value, ast.JoinedStr):
+                    # Minimal f-string support: only variable placeholders
+                    deps: List[str] = []
+                    parts: List[str] = []
+                    for item in value.values:
+                        if isinstance(item, ast.Constant) and isinstance(item.value, str):
+                            parts.append(item.value)
+                        elif isinstance(item, ast.FormattedValue) and isinstance(item.value, ast.Name):
+                            name = item.value.id
+                            if name not in defined:
+                                raise DSLParseError(f"Undefined dependency: {name}")
+                            deps.append(name)
+                            parts.append("{" + str(len(deps) - 1) + "}")
+                        else:
+                            raise DSLParseError("f-strings may only contain variable names")
+                    template = "".join(parts)
+                    ops.append({
+                        "id": var_name,
+                        "op": "TEXT.format",
+                        "deps": deps,
+                        "args": {"template": template},
+                    })
+                else:
+                    raise DSLParseError("Right hand side must be a call or f-string")
+                defined.add(var_name)
+
+            elif isinstance(stmt, ast.Expr):
+                call = stmt.value
+                if isinstance(call, ast.Await):
+                    call = call.value
+                if not isinstance(call, ast.Call):
+                    raise DSLParseError("Only call expressions allowed at top level")
+                name = _get_call_name(call.func)
+                if name == "settings":
+                    for kw in call.keywords:
+                        if kw.arg is None:
+                            raise DSLParseError("settings does not accept **kwargs")
+                        settings[kw.arg] = _literal(kw.value)
+                    if call.args:
+                        raise DSLParseError("settings only accepts keyword literals")
+                elif name == "output":
+                    if len(call.args) != 1 or not isinstance(call.args[0], ast.Name):
+                        raise DSLParseError("output requires a single variable name argument")
+                    var = call.args[0].id
+                    if var not in defined:
+                        raise DSLParseError(f"Undefined output variable: {var}")
+                    filename = None
+                    for kw in call.keywords:
+                        if kw.arg in {"as", "as_"}:
+                            filename = _literal(kw.value)
+                        else:
+                            raise DSLParseError("output only accepts 'as' keyword")
+                    if filename is None or not isinstance(filename, str):
+                        raise DSLParseError("output requires as=\"filename\"")
+                    outputs.append({"from": var, "as": filename})
+                else:
+                    raise DSLParseError("Only settings() and output() calls allowed as expressions")
+            elif isinstance(stmt, ast.Return):
+                if i != len(fn.body) - 1:  # type: ignore[index]
+                    raise DSLParseError("return must be the last statement")
+                if isinstance(stmt.value, ast.Name):
+                    var = stmt.value.id
+                    if var not in defined:
+                        raise DSLParseError(f"Undefined return variable: {var}")
+                    returned_var = var
+                elif isinstance(stmt.value, ast.Constant):
+                    # Support returning a literal (e.g., "DONE"): synthesize a const op
+                    lit = stmt.value.value
+                    const_id_base = "return_value"
+                    const_id = const_id_base
+                    n = 1
+                    while const_id in defined:
+                        const_id = f"{const_id_base}_{n}"
+                        n += 1
+                    ops.append({
+                        "id": const_id,
+                        "op": "CONST.value",
+                        "deps": [],
+                        "args": {"value": lit},
+                    })
+                    returned_var = const_id
+                else:
+                    raise DSLParseError("return must return a variable name or literal")
+            else:
+                raise DSLParseError("Only assignments, expression calls, and a final return are allowed in function body")
+
+        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")
+        if len(ops) > 200:
+            raise DSLParseError("Too many operations")
+
+        # Include the parsed function name for visibility/debugging
+        fn_name = getattr(fn, "name", None)  # type: ignore[attr-defined]
+        plan: Dict[str, Any] = {"version": 1, "function": fn_name, "ops": ops, "outputs": outputs}
+        if settings:
+            plan["settings"] = settings
+        return plan
+
+    # If a specific function name is provided, use it; otherwise try to auto-detect
+    if function_name is not None:
+        fn: Optional[ast.AST] = None
+        for node in module.body:
+            if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name == function_name:
+                fn = node
+                break
+        if fn is None:
+            raise DSLParseError(f"Function {function_name!r} not found")
+        return _parse_fn(fn)
+    else:
+        last_err: Optional[Exception] = None
+        for node in module.body:
+            if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
+                try:
+                    return _parse_fn(node)
+                except DSLParseError as e:
+                    last_err = e
+                    continue
+        # If we got here, either there are no functions or none matched the DSL
+        if last_err is not None:
+            raise DSLParseError("No suitable function matched the DSL; specify --func to disambiguate") from last_err
+        raise DSLParseError("No function definitions found in source")
+
+
+def parse_file(filename: str, function_name: Optional[str] = None) -> Dict[str, Any]:
+    with open(filename, "r", encoding="utf-8") as f:
+        src = f.read()
+    return parse(src, function_name=function_name)

{py2dag-0.1.4 → py2dag-0.1.6}/pyproject.toml

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

py2dag-0.1.4/py2dag/parser.py

@@ -1,173 +0,0 @@
-import ast
-import json
-import re
-from typing import Any, Dict, List, Optional
-
-VALID_NAME_RE = re.compile(r'^[a-z_][a-z0-9_]{0,63}$')
-
-
-class DSLParseError(Exception):
-    """Raised when the mini-DSL constraints are violated."""
-
-
-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.List, ast.Tuple)):
-        return [_literal(elt) for elt in node.elts]
-    if isinstance(node, ast.Dict):
-        return {_literal(k): _literal(v) for k, v in zip(node.keys, node.values)}
-    raise DSLParseError("Keyword argument values must be JSON-serialisable literals")
-
-
-def _get_call_name(func: ast.AST) -> str:
-    if isinstance(func, ast.Name):
-        return func.id
-    if isinstance(func, ast.Attribute):
-        parts: List[str] = []
-        while isinstance(func, ast.Attribute):
-            parts.append(func.attr)
-            func = func.value
-        if isinstance(func, ast.Name):
-            parts.append(func.id)
-            return ".".join(reversed(parts))
-    raise DSLParseError("Only simple or attribute names are allowed for operations")
-
-
-def parse(source: str, function_name: str = "plan") -> Dict[str, Any]:
-    if len(source) > 20_000:
-        raise DSLParseError("Source too large")
-    module = ast.parse(source)
-    fn = None
-    for node in module.body:
-        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name == function_name:
-            fn = node
-            break
-    if fn is None:
-        raise DSLParseError(f"Function {function_name!r} not found")
-
-    defined: set[str] = set()
-    ops: List[Dict[str, Any]] = []
-    outputs: List[Dict[str, str]] = []
-    settings: Dict[str, Any] = {}
-
-    returned_var: Optional[str] = None
-    for i, stmt in enumerate(fn.body):
-        if isinstance(stmt, ast.Assign):
-            if len(stmt.targets) != 1 or not isinstance(stmt.targets[0], ast.Name):
-                raise DSLParseError("Assignment targets must be simple names")
-            var_name = stmt.targets[0].id
-            if not VALID_NAME_RE.match(var_name):
-                raise DSLParseError(f"Invalid variable name: {var_name}")
-            if var_name in defined:
-                raise DSLParseError(f"Duplicate variable name: {var_name}")
-
-            value = stmt.value
-            if isinstance(value, ast.Await):
-                value = value.value
-            if isinstance(value, ast.Call):
-                op_name = _get_call_name(value.func)
-
-                deps: List[str] = []
-                for arg in value.args:
-                    if not isinstance(arg, ast.Name):
-                        raise DSLParseError("Positional args must be variable names")
-                    if arg.id not in defined:
-                        raise DSLParseError(f"Undefined dependency: {arg.id}")
-                    deps.append(arg.id)
-
-                kwargs: Dict[str, Any] = {}
-                for kw in value.keywords:
-                    if kw.arg is None:
-                        raise DSLParseError("**kwargs are not allowed")
-                    kwargs[kw.arg] = _literal(kw.value)
-
-                ops.append({"id": var_name, "op": op_name, "deps": deps, "args": kwargs})
-            elif isinstance(value, ast.JoinedStr):
-                # Minimal f-string support: only variable placeholders
-                deps: List[str] = []
-                parts: List[str] = []
-                for item in value.values:
-                    if isinstance(item, ast.Constant) and isinstance(item.value, str):
-                        parts.append(item.value)
-                    elif isinstance(item, ast.FormattedValue) and isinstance(item.value, ast.Name):
-                        name = item.value.id
-                        if name not in defined:
-                            raise DSLParseError(f"Undefined dependency: {name}")
-                        deps.append(name)
-                        parts.append("{" + str(len(deps) - 1) + "}")
-                    else:
-                        raise DSLParseError("f-strings may only contain variable names")
-                template = "".join(parts)
-                ops.append({
-                    "id": var_name,
-                    "op": "TEXT.format",
-                    "deps": deps,
-                    "args": {"template": template},
-                })
-            else:
-                raise DSLParseError("Right hand side must be a call or f-string")
-            defined.add(var_name)
-
-        elif isinstance(stmt, ast.Expr):
-            call = stmt.value
-            if isinstance(call, ast.Await):
-                call = call.value
-            if not isinstance(call, ast.Call):
-                raise DSLParseError("Only call expressions allowed at top level")
-            name = _get_call_name(call.func)
-            if name == "settings":
-                for kw in call.keywords:
-                    if kw.arg is None:
-                        raise DSLParseError("settings does not accept **kwargs")
-                    settings[kw.arg] = _literal(kw.value)
-                if call.args:
-                    raise DSLParseError("settings only accepts keyword literals")
-            elif name == "output":
-                if len(call.args) != 1 or not isinstance(call.args[0], ast.Name):
-                    raise DSLParseError("output requires a single variable name argument")
-                var = call.args[0].id
-                if var not in defined:
-                    raise DSLParseError(f"Undefined output variable: {var}")
-                filename = None
-                for kw in call.keywords:
-                    if kw.arg in {"as", "as_"}:
-                        filename = _literal(kw.value)
-                    else:
-                        raise DSLParseError("output only accepts 'as' keyword")
-                if filename is None or not isinstance(filename, str):
-                    raise DSLParseError("output requires as=\"filename\"")
-                outputs.append({"from": var, "as": filename})
-            else:
-                raise DSLParseError("Only settings() and output() calls allowed as expressions")
-        elif isinstance(stmt, ast.Return):
-            if i != len(fn.body) - 1:
-                raise DSLParseError("return must be the last statement")
-            if not isinstance(stmt.value, ast.Name):
-                raise DSLParseError("return must return a variable name")
-            var = stmt.value.id
-            if var not in defined:
-                raise DSLParseError(f"Undefined return variable: {var}")
-            returned_var = var
-        else:
-            raise DSLParseError("Only assignments, expression calls, and a final return are allowed in function body")
-
-    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")
-    if len(ops) > 200:
-        raise DSLParseError("Too many operations")
-
-    plan: Dict[str, Any] = {"version": 1, "ops": ops, "outputs": outputs}
-    if settings:
-        plan["settings"] = settings
-    return plan
-
-
-def parse_file(filename: str, function_name: str = "plan") -> Dict[str, Any]:
-    with open(filename, "r", encoding="utf-8") as f:
-        src = f.read()
-    return parse(src, function_name=function_name)