procfunc 0.35.0__tar.gz → 0.35.1__tar.gz

{procfunc-0.35.0/src/procfunc.egg-info → procfunc-0.35.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procfunc
-Version: 0.35.0
+Version: 0.35.1
 Summary: Function-Oriented Abstractions for Procedural 3D Generation in Python
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/princeton-vl/procfunc
@@ -9,15 +9,18 @@ Requires-Python: <3.12,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: bpy==4.2.0
-Requires-Dist: numpy<2
-Requires-Dist: pandas
+Requires-Dist: numpy<2,>=1.23.5
+Requires-Dist: pandas>=1.5
+Provides-Extra: test
+Requires-Dist: pytest<10,>=7.2; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest<10,>=7.2; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: ruff<0.16,>=0.15; extra == "dev"
 Requires-Dist: ty; extra == "dev"
 Requires-Dist: imageio; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{procfunc-0.35.0 → procfunc-0.35.1}/pyproject.toml

@@ -11,8 +11,8 @@ license = "BSD-3-Clause"
 requires-python = ">=3.11,<3.12"
 dependencies = [
     "bpy==4.2.0",
-    "numpy<2",
-    "pandas",
+    "numpy>=1.23.5,<2",
+    "pandas>=1.5",
 ]
 
 [project.urls]
@@ -23,13 +23,17 @@ Repository = "https://github.com/princeton-vl/procfunc"
 procfunc = "procfunc.cli:cli"
 
 [project.optional-dependencies]
+test = [
+    "pytest>=7.2,<10",
+]
 dev = [
-    "pytest",
+    "pytest>=7.2,<10",
     "pytest-xdist",
     "ruff>=0.15,<0.16",
     "ty",
     "imageio",
     "matplotlib",
+    "coverage",
 ]
 docs = [
     "sphinx",

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/__init__.py

@@ -2,7 +2,7 @@
 # ensure this gets imported first so that mathutils etc is available even if later modules dont import bpy
 import bpy
 
-__version__ = "0.35.0"
+__version__ = "0.35.1"
 
 from numpy.random import Generator as RNG
 

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/context.py

@@ -19,6 +19,13 @@ class ProcfuncContext:
     'ignore' silently returns an empty mesh, 'warn' logs a warning, 'throw' raises an error.
     """
 
+    record_node_definitions: bool = False
+    """
+    Record the user-space file/line/function that constructed each ProcNode, used only to
+    enrich node-instantiation error messages. Walks the stack once per node, which can
+    dominate build time in node-heavy callers, so off by default.
+    """
+
     def __post_init__(self):
         """Initialize computed fields after dataclass creation."""
         if self.num_cpu_cores <= 0:
@@ -44,6 +51,8 @@ globals = ProcfuncContext(
     num_cpu_cores=int(os.environ.get("PROCFUNC_NUM_CPU_CORES", 0)),
     warn_mode_empty_geonodes=_warn_mode_empty_geonodes,  # type: ignore[invalid-assignment]
     current_trace_level=None,
+    record_node_definitions=os.environ.get("PROCFUNC_RECORD_NODE_DEFINITIONS", "0")
+    == "1",
 )
 
 

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/nodes/types.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Any, Generic, TypeVar, Union
 
 from procfunc import compute_graph as cg
+from procfunc import context
 from procfunc import types as pt
 from procfunc.compute_graph.operators_info import (
     OPERATORS_TO_FUNCTIONS,
@@ -79,7 +80,8 @@ class ProcNode(Generic[T]):
                 f"these should have been unwrapped to cg.Node {node.args} {node.kwargs}"
             )
 
-        self._node.metadata["definition"] = _node_definition_metadata()
+        if context.globals.record_node_definitions:
+            self._node.metadata["definition"] = _node_definition_metadata()
 
     def astype(self, dtype: type) -> "ProcNode":
         node = copy.copy(self._node)
@@ -114,7 +116,8 @@ class ProcNode(Generic[T]):
             )
 
         node = cg.ProceduralNode(node_type=node_type, attrs=attrs, kwargs=inputs)
-        node.metadata["definition"] = _node_definition_metadata()
+        if context.globals.record_node_definitions:
+            node.metadata["definition"] = _node_definition_metadata()
 
         return cls(node=node)
 
@@ -262,7 +265,11 @@ def node_definition_context_message(node: cg.Node):
     metadata = object.__getattribute__(node, "metadata")
     lineno_metadata = metadata.get("definition", None)
     if lineno_metadata is None:
-        return ""
+        return (
+            " (set PROCFUNC_RECORD_NODE_DEFINITIONS=1 or "
+            "override_globals(record_node_definitions=True) to see the "
+            "file/line that defined this node) "
+        )
     file, lineno, procfunc_name = lineno_metadata
     return f" {procfunc_name}() call on {file}:{lineno} "
 

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/transpiler/bpy_to_computegraph.py

@@ -1196,9 +1196,11 @@ def parse_geo_modifier(
                 pf.nodes.to_mesh_object, args=(node_curr,), kwargs={}
             )
         case 1, _:
+            (geometry_getattr,) = geo_output_getattrs.values()
             return cg.FunctionCallNode(
                 pf.nodes.to_mesh_object_with_attributes,
-                kwargs={**geo_output_getattrs, **attribute_output_getattrs},
+                args=(geometry_getattr,),
+                kwargs={"attributes": attribute_output_getattrs},
             )
         case _, _:
             return cg.FunctionCallNode(

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/util/manifest.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import Any, Callable
 
 import pandas as pd
+from pandas.api.types import is_string_dtype
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +47,7 @@ def filter_manifest(
             patterns = [patterns]
 
         before_count = len(manifest)
-        if manifest[column].dtype == "object":
+        if is_string_dtype(manifest[column].dtype):
             mask = pd.Series([False] * len(manifest), index=manifest.index)
             for pattern in patterns:
                 if isinstance(pattern, str):

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc/util/teardown.py

@@ -2,7 +2,8 @@
 
 bpy's cleanup segfaults (SIGSEGV / exit code 139) during normal Python
 shutdown. ``os._exit`` skips Python teardown and atexit handlers, avoiding
-the crash while preserving the real exit code.
+the crash while preserving the real exit code. Anything the process would
+otherwise have written on its way out is flushed here first.
 """
 
 import os
@@ -11,7 +12,20 @@ import traceback
 from contextlib import contextmanager
 
 
+def _save_coverage() -> None:
+    # coverage.py saves once the traced process returns, which os._exit never does
+    try:
+        import coverage
+
+        cov = coverage.Coverage.current()
+        if cov is not None:
+            cov.save()
+    except Exception:
+        traceback.print_exc()
+
+
 def exit_skipping_teardown(code: int = 0):
+    _save_coverage()
     sys.stdout.flush()
     sys.stderr.flush()
     os._exit(code)

{procfunc-0.35.0 → procfunc-0.35.1/src/procfunc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procfunc
-Version: 0.35.0
+Version: 0.35.1
 Summary: Function-Oriented Abstractions for Procedural 3D Generation in Python
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/princeton-vl/procfunc
@@ -9,15 +9,18 @@ Requires-Python: <3.12,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: bpy==4.2.0
-Requires-Dist: numpy<2
-Requires-Dist: pandas
+Requires-Dist: numpy<2,>=1.23.5
+Requires-Dist: pandas>=1.5
+Provides-Extra: test
+Requires-Dist: pytest<10,>=7.2; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest<10,>=7.2; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: ruff<0.16,>=0.15; extra == "dev"
 Requires-Dist: ty; extra == "dev"
 Requires-Dist: imageio; extra == "dev"
 Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc.egg-info/SOURCES.txt

@@ -101,5 +101,6 @@ tests/test_node_function.py
 tests/test_ops.py
 tests/test_pytree.py
 tests/test_random.py
+tests/test_teardown.py
 tests/test_trace.py
 tests/test_transforms.py

{procfunc-0.35.0 → procfunc-0.35.1}/src/procfunc.egg-info/requires.txt

@@ -1,16 +1,20 @@
 bpy==4.2.0
-numpy<2
-pandas
+numpy<2,>=1.23.5
+pandas>=1.5
 
 [dev]
-pytest
+pytest<10,>=7.2
 pytest-xdist
 ruff<0.16,>=0.15
 ty
 imageio
 matplotlib
+coverage
 
 [docs]
 sphinx
 sphinx-rtd-theme
 sphinx-argparse
+
+[test]
+pytest<10,>=7.2

procfunc-0.35.1/tests/test_teardown.py

@@ -0,0 +1,51 @@
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+_REPO = Path(__file__).resolve().parents[1]
+
+
+def write_entrypoint(tmp_path: Path, body: str) -> Path:
+    script = tmp_path / "entrypoint.py"
+    script.write_text(
+        "from procfunc.util.teardown import skip_teardown_on_exit\n\n" + body
+    )
+    return script
+
+
+def run(cmd: list[str], tmp_path: Path) -> subprocess.CompletedProcess:
+    return subprocess.run(
+        cmd,
+        cwd=_REPO,
+        env={**os.environ, "COVERAGE_FILE": str(tmp_path / "data")},
+        capture_output=True,
+        text=True,
+    )
+
+
+def test_coverage_data_saved_before_exit(tmp_path):
+    pytest.importorskip("coverage")
+    script = write_entrypoint(
+        tmp_path, "with skip_teardown_on_exit():\n    print('ran')\n"
+    )
+
+    proc = run(
+        [sys.executable, "-m", "coverage", "run", "--parallel-mode", str(script)],
+        tmp_path,
+    )
+
+    assert proc.returncode == 0, proc.stderr
+    assert sorted(tmp_path.glob("data.*")), proc.stderr
+
+
+def test_exit_code_preserved_without_coverage(tmp_path):
+    script = write_entrypoint(
+        tmp_path, "with skip_teardown_on_exit():\n    raise SystemExit(3)\n"
+    )
+
+    proc = run([sys.executable, str(script)], tmp_path)
+
+    assert proc.returncode == 3, proc.stderr