procfunc 0.30.1__tar.gz → 0.31.0__tar.gz

{procfunc-0.30.1/src/procfunc.egg-info → procfunc-0.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procfunc
-Version: 0.30.1
+Version: 0.31.0
 Summary: Function-Oriented Abstractions for Procedural 3D Generation in Python
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/princeton-vl/procfunc
@@ -19,13 +19,13 @@ Requires-Dist: ty; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: sphinx-argparse; extra == "docs"
 Dynamic: license-file
 
 # ProcFunc: Function-Oriented Abstractions for Procedural 3D Generation in Python
 
 [**Documentation**](#documentation)
 | [**Research Paper**](https://arxiv.org/abs/2604.26943)
-| [**Documentation**](https://procfunc.readthedocs.io)
 | [**Transpiling**](#transpile-a-blender-file-to-procfunc-code)
 | [**Experiments**](#experiments)
 | [**Contributing**](#contributing)
@@ -62,7 +62,7 @@ Please create Github Issues for any bugs or  unclear interfaces!
 Convert a Blender geometry node tree into procfunc Python code by downloading our example blend and executing the transpiler:
 ```bash
 wget https://raw.githubusercontent.com/princeton-vl/procfunc/main/examples/transpile_simple_chair/simple_chair.blend
-uv run python -m procfunc.transpiler.main simple_chair.blend --node_trees simple_chair --output transpiled_code.py
+uv run procfunc transpile simple_chair.blend --node_trees simple_chair --output transpiled_code.py
 ```
 
 See the expected output in [`examples/transpile_simple_chair/transpiled_code.py`](examples/transpile_simple_chair/transpiled_code.py).

{procfunc-0.30.1 → procfunc-0.31.0}/README.md

@@ -2,7 +2,6 @@
 
 [**Documentation**](#documentation)
 | [**Research Paper**](https://arxiv.org/abs/2604.26943)
-| [**Documentation**](https://procfunc.readthedocs.io)
 | [**Transpiling**](#transpile-a-blender-file-to-procfunc-code)
 | [**Experiments**](#experiments)
 | [**Contributing**](#contributing)
@@ -39,7 +38,7 @@ Please create Github Issues for any bugs or  unclear interfaces!
 Convert a Blender geometry node tree into procfunc Python code by downloading our example blend and executing the transpiler:
 ```bash
 wget https://raw.githubusercontent.com/princeton-vl/procfunc/main/examples/transpile_simple_chair/simple_chair.blend
-uv run python -m procfunc.transpiler.main simple_chair.blend --node_trees simple_chair --output transpiled_code.py
+uv run procfunc transpile simple_chair.blend --node_trees simple_chair --output transpiled_code.py
 ```
 
 See the expected output in [`examples/transpile_simple_chair/transpiled_code.py`](examples/transpile_simple_chair/transpiled_code.py).

{procfunc-0.30.1 → procfunc-0.31.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "procfunc"
-version = "0.30.1"
+version = "0.31.0"
 description = "Function-Oriented Abstractions for Procedural 3D Generation in Python"
 readme = "README.md"
 license = "BSD-3-Clause"
@@ -19,6 +19,9 @@ dependencies = [
 Homepage = "https://github.com/princeton-vl/procfunc"
 Repository = "https://github.com/princeton-vl/procfunc"
 
+[project.scripts]
+procfunc = "procfunc.cli:cli"
+
 [project.optional-dependencies]
 dev = [
     "pytest",
@@ -29,13 +32,14 @@ dev = [
 docs = [
     "sphinx",
     "sphinx-rtd-theme",
+    "sphinx-argparse",
 ]
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.setuptools.package-data]
-procfunc = ["**/*.json"]
+procfunc = ["nodes/manifest.json", "ops/manifest.json"]
 
 [tool.pytest.ini_options]
 testpaths = "tests"

{procfunc-0.30.1 → procfunc-0.31.0}/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.30.1"
+__version__ = "0.30.2"
 
 from numpy.random import Generator as RNG
 
@@ -41,6 +41,7 @@ from .types import (
     LightObject,
     LightProbeObject,
     MetaObject,
+    PointCloudObject,
     Material,
     Texture,
     Collection,

procfunc-0.31.0/src/procfunc/cli.py

@@ -0,0 +1,35 @@
+import argparse
+
+from procfunc.transpiler import main as transpiler_main
+from procfunc.util.teardown import skip_teardown_on_exit
+
+
+def get_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(prog="procfunc")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    transpile_parser = subparsers.add_parser(
+        "transpile", help="Transpile a Blender file to procfunc Python code."
+    )
+    transpiler_main.add_transpile_arguments(transpile_parser)
+
+    return parser
+
+
+def main():
+    parser = get_parser()
+    args = parser.parse_args()
+
+    if args.command == "transpile":
+        transpiler_main.run(args)
+    else:
+        parser.error(f"Unknown command: {args.command}")
+
+
+def cli():
+    with skip_teardown_on_exit():
+        main()
+
+
+if __name__ == "__main__":
+    cli()

procfunc-0.31.0/src/procfunc/codegen/__init__.py

@@ -0,0 +1,8 @@
+from .codegen import default_func_resolution_map, to_python
+from .identifiers import dedup_names_with_suffix
+
+__all__ = [
+    "default_func_resolution_map",
+    "to_python",
+    "dedup_names_with_suffix",
+]

{procfunc-0.30.1/src/procfunc/transpiler → procfunc-0.31.0/src/procfunc/codegen}/codegen.py

@@ -11,13 +11,13 @@ import numpy as np
 
 import procfunc as pf
 from procfunc import compute_graph as cg
+from procfunc.codegen import identifiers
 from procfunc.compute_graph.operators_info import (
     FUNCTIONS_TO_OPERATORS,
     OPERATOR_TEMPLATES,
     OperatorType,
 )
 from procfunc.nodes import types as nt
-from procfunc.transpiler import identifiers
 from procfunc.util import pytree
 
 logger = logging.getLogger(__name__)
@@ -97,7 +97,7 @@ def _repr_value(value: Any) -> str:
     elif isinstance(value, np.dtype):
         return f"np.dtype('{value}')"
     elif isinstance(value, (pf.Color, pf.Vector, pf.Euler, pf.Quaternion, pf.Matrix)):
-        x = tuple(round(x, 6) for x in value)
+        x = tuple(round(x, 8) for x in value)
         return f"pf.{value.__class__.__name__}({x})"
     elif isinstance(value, enum.Enum):
         return f"{type(value).__name__}.{value.name}"
@@ -111,6 +111,11 @@ def _repr_value(value: Any) -> str:
         return f"{type(value).__name__}({args_str})"
     elif isinstance(value, list):
         return f"[{', '.join([_repr_value(x) for x in value])}]"
+    elif isinstance(value, tuple):
+        inner = ", ".join(_repr_value(x) for x in value)
+        return f"({inner},)" if len(value) == 1 else f"({inner})"
+    elif isinstance(value, float) and not isinstance(value, bool):
+        return repr(round(value, 8))
     else:
         return repr(value)
 
@@ -389,7 +394,9 @@ def _codegen_for_outputs(
     scope_expressions: dict[int, str | list[str]],
 ) -> tuple[str | None, list[str], list[str]]:
     if len(graph.outputs) == 0:
-        return None, [], []
+        # Sink graphs (no return values) still need a body statement so the
+        # generated function parses; emit `pass` when nothing else fills it.
+        return None, [], ["pass"]
     if len(graph.outputs) == 1:
         single_output = next(graph.outputs.values())
         vt = single_output.metadata.get("known_value_type", None)
@@ -720,7 +727,7 @@ def default_func_resolution_map(
     skip_funcs: set | None = None,
 ) -> tuple[dict[Any, str | OperatorType], list[str]]:
     func_resolution = {}
-    import_lines = set()
+    import_lines = {"import procfunc as pf"}
 
     for graph in cg.traverse_nested_graphs(toplevel_graph):
         assert isinstance(graph, cg.ComputeGraph), graph

{procfunc-0.30.1 → procfunc-0.31.0}/src/procfunc/compute_graph/node.py

@@ -56,13 +56,6 @@ class FunctionCallNode(Node):
 
 
 class MethodCallNode(Node):
-    """
-    represents an {args[0]}.{method_name}(*args[1:], **kwargs) call
-
-    - the node to be used as `self` is the first arg, since it is a dynamic value
-    - the method name is assumed to be const
-    """
-
     def __init__(
         self,
         callee: Node,
@@ -161,7 +154,7 @@ def normalize_args_to_kwargs(
     """
     Try to fully populate kwargs, by moving over positional args & filling in defaults
 
-    Some args may not be able to be converted to kwargs, e.g. *args have no names that work
+    Some args may not be able to be converted to kwargs, e.g. ``*args`` have no names that work
 
     Args:
         func: The function whose signature we should respect
@@ -171,7 +164,7 @@ def normalize_args_to_kwargs(
     Returns:
         A tuple of (args, kwargs) where args is a tuple of positional arguments and kwargs is a dictionary of keyword arguments.
 
-    GUARANTEE: func(*returned_args, **returned_kwargs) == func(*args, **kwargs) and does not crash
+    GUARANTEE: ``func(*returned_args, **returned_kwargs) == func(*args, **kwargs)`` and does not crash
     """
 
     sig = inspect.signature(func)

{procfunc-0.30.1 → procfunc-0.31.0}/src/procfunc/nodes/__init__.py

@@ -3,15 +3,17 @@ from pandas import read_json as _read_json
 from procfunc.tracer import autowrap_module as _autowrap
 from procfunc.util.manifest import module_path
 
-from . import compositor, func, geo, math, shader
+from . import color, compositor, func, geo, math, shader, texture
 from .bpy_node_info import NodeDataType, NodeGroupType, SocketType
 
 # ruff: noqa: E402
+_autowrap(color, allow_exec=False)
 _autowrap(compositor, allow_exec=False)
 _autowrap(func, allow_exec=False)
 _autowrap(geo, allow_exec=False)
 _autowrap(math, allow_exec=False)
 _autowrap(shader, allow_exec=False)
+_autowrap(texture, allow_exec=False)
 
 from .execute.execute import (
     as_nodegroup,
@@ -38,11 +40,13 @@ NODES_MANIFEST = _read_json(NODES_MANIFEST_PATH)
 
 __all__ = [
     # Node category submodules
+    "color",
     "compositor",
     "func",
     "geo",
     "math",
     "shader",
+    "texture",
     # Core types
     "ProcNode",
     "Shader",

{procfunc-0.30.1 → procfunc-0.31.0}/src/procfunc/nodes/bindings_util.py

@@ -24,6 +24,11 @@ class ContextualNode(Enum):
     GROUP = "ContextualGroup"
     MIX_RGB = "ContextualMixRGB"
     MATH = "ContextualMath"
+    COLOR_RAMP = "ContextualColorRamp"
+    VECTOR_CURVE = "ContextualVectorCurve"
+    COMBINE_XYZ = "ContextualCombineXYZ"
+    MAP_RANGE = "ContextualMapRange"
+    HUE_SATURATION = "ContextualHueSaturation"
 
     @classmethod
     def parse_name(cls, from_name: str) -> Self | None:
@@ -39,6 +44,7 @@ class NodeContextResolution:
     node_group_type: NodeGroupType
     node_type: str
     input_keys_map: dict[str, tuple[str, int] | str | None] | None
+    output_keys_map: dict[str, str] | None = None
 
 
 # Mapping to map unified version of nodes to context-specific blender versions
@@ -64,6 +70,12 @@ CONTEXTUAL_NODE_MAPPING = [
         node_type="FunctionNodeCombineColor",
         input_keys_map=None,
     ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COMBINE_COLOR,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        node_type="CompositorNodeCombineColor",
+        input_keys_map=None,
+    ),
     NodeContextResolution(
         contextual_node=ContextualNode.SEPARATE_COLOR,
         node_group_type=NodeGroupType.SHADER,
@@ -130,6 +142,12 @@ CONTEXTUAL_NODE_MAPPING = [
         node_type="ShaderNodeMath",
         input_keys_map=None,
     ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.MATH,
+        node_group_type=NodeGroupType.GEOMETRY,
+        node_type="ShaderNodeMath",
+        input_keys_map=None,
+    ),
     NodeContextResolution(
         contextual_node=ContextualNode.MATH,
         node_group_type=NodeGroupType.COMPOSITOR,
@@ -142,12 +160,104 @@ CONTEXTUAL_NODE_MAPPING = [
         node_type="TextureNodeMath",
         input_keys_map=None,
     ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COLOR_RAMP,
+        node_group_type=NodeGroupType.SHADER,
+        node_type="ShaderNodeValToRGB",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COLOR_RAMP,
+        node_group_type=NodeGroupType.GEOMETRY,
+        node_type="ShaderNodeValToRGB",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COLOR_RAMP,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        node_type="CompositorNodeValToRGB",
+        input_keys_map=None,
+        output_keys_map={"Color": "Image"},
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.VECTOR_CURVE,
+        node_group_type=NodeGroupType.SHADER,
+        node_type="ShaderNodeVectorCurve",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.VECTOR_CURVE,
+        node_group_type=NodeGroupType.GEOMETRY,
+        node_type="ShaderNodeVectorCurve",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.VECTOR_CURVE,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        # CompositorNodeCurveVec has no Fac input; the wrapper's `fac` arg is dropped
+        # silently in compositor context. Honoring fac would require synthesizing an
+        # extra mix node.
+        node_type="CompositorNodeCurveVec",
+        input_keys_map={"Fac": None},
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COMBINE_XYZ,
+        node_group_type=NodeGroupType.SHADER,
+        node_type="ShaderNodeCombineXYZ",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COMBINE_XYZ,
+        node_group_type=NodeGroupType.GEOMETRY,
+        node_type="ShaderNodeCombineXYZ",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.COMBINE_XYZ,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        node_type="CompositorNodeCombineXYZ",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.MAP_RANGE,
+        node_group_type=NodeGroupType.SHADER,
+        node_type="ShaderNodeMapRange",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.MAP_RANGE,
+        node_group_type=NodeGroupType.GEOMETRY,
+        node_type="ShaderNodeMapRange",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.MAP_RANGE,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        # CompositorNodeMapRange exposes only float Value and use_clamp; it has
+        # no interpolation_type and no vector data_type. The wrapper omits
+        # those attrs when at default, so setattr only fails (with its own
+        # "no attribute" error) when a user actually requested a non-default.
+        node_type="CompositorNodeMapRange",
+        input_keys_map={"clamp": "use_clamp"},
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.HUE_SATURATION,
+        node_group_type=NodeGroupType.SHADER,
+        node_type="ShaderNodeHueSaturation",
+        input_keys_map=None,
+    ),
+    NodeContextResolution(
+        contextual_node=ContextualNode.HUE_SATURATION,
+        node_group_type=NodeGroupType.COMPOSITOR,
+        node_type="CompositorNodeHueSat",
+        input_keys_map={"Color": "Image"},
+    ),
 ]
 
 
 def resolve_contextual_node(
     node: list[NodeContextResolution], group: NodeGroupType
-) -> tuple[str, dict[str, str]]:
+) -> NodeContextResolution:
     item = next(
         (
             item
@@ -160,7 +270,7 @@ def resolve_contextual_node(
     if item is None:
         raise ValueError(f"No contextual node found for {node} in {group}")
 
-    return item.node_type, item.input_keys_map
+    return item
 
 
 def raise_shader_normal_error(node_func_name: str, logger: logging.Logger):

{procfunc-0.30.1 → procfunc-0.31.0}/src/procfunc/nodes/bpy_node_info.py

@@ -58,6 +58,8 @@ class SocketType(Enum):
     COLLECTION = "NodeSocketCollection"
     TEXTURE = "NodeSocketTexture"
     MATERIAL = "NodeSocketMaterial"
+    MATRIX = "NodeSocketMatrix"
+    IMAGE = "NodeSocketImage"
 
 
 class SocketDType(Enum):
@@ -150,6 +152,10 @@ SOCKET_TYPE_TO_PYTHON_TYPE = {
     SocketType.COLLECTION: pt.Collection,
     SocketType.MATERIAL: pt.Material,
     SocketType.SHADER: nt.Shader,
+    SocketType.OBJECT: pt.Object,
+    SocketType.TEXTURE: pt.Texture,
+    SocketType.MATRIX: pt.Matrix,
+    SocketType.IMAGE: pt.Image,
 }
 
 # Socket types that can be implicitly converted between each other
@@ -263,6 +269,7 @@ SPECIAL_CASE_ATTR_NAMES = set(
         "interface",
         "node_tree",
         "tag_need_exec",
+        "index_switch_items",
     ]
 )