procfunc 0.33.2__tar.gz → 0.34.0__tar.gz

{procfunc-0.33.2/src/procfunc.egg-info → procfunc-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procfunc
-Version: 0.33.2
+Version: 0.34.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
@@ -16,6 +16,8 @@ Requires-Dist: pytest; 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"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{procfunc-0.33.2 → procfunc-0.34.0}/pyproject.toml

@@ -27,7 +27,9 @@ dev = [
     "pytest",
     "pytest-xdist",
     "ruff>=0.15,<0.16",
-    "ty"
+    "ty",
+    "imageio",
+    "matplotlib",
 ]
 docs = [
     "sphinx",

{procfunc-0.33.2 → procfunc-0.34.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.33.2"
+__version__ = "0.34.0"
 
 from numpy.random import Generator as RNG
 

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/color.py

@@ -31,12 +31,7 @@ def rgb_color(
 ) -> t.Color:
     if rgb is None and (r is None or g is None or b is None):
         raise ValueError("provide rgb=... or all of r/g/b")
-    color = t.Color()
-    if rgb is not None:
-        color.r, color.g, color.b = rgb
-    else:
-        color.r, color.g, color.b = r, g, b
-    return color
+    return t.Color(rgb if rgb is not None else (r, g, b))
 
 
 def _srgb_to_linearrgb(c):
@@ -48,14 +43,12 @@ def _srgb_to_linearrgb(c):
         return ((c + 0.055) / 1.055) ** 2.4
 
 
-def _hex_to_rgb(h: int, alpha: float = 1):
+def _hex_to_rgb(h: int):
     r = (h & 0xFF0000) >> 16
     g = (h & 0x00FF00) >> 8
     b = h & 0x0000FF
     return tuple([_srgb_to_linearrgb(c / 0xFF) for c in (r, g, b)])
 
 
-def hex_color(h: int, alpha: float = 1):
-    c = t.Color()
-    c.r, c.g, c.b = _hex_to_rgb(h, alpha)
-    return c
+def hex_color(h: int) -> t.Color:
+    return t.Color(_hex_to_rgb(h))

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/compute_graph/__init__.py

@@ -45,7 +45,6 @@ __all__ = [
     "LiteralConstant",
     "graph_nodes_equal",
     "transform_compute_graph",
-    "transform_nodetree",
     "traverse_breadth_first",
     "traverse_depth_first",
     "traverse_depth_first_node",

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/context.py

@@ -13,24 +13,6 @@ class ProcfuncContext:
     num_cpu_cores: int
     current_trace_level: int | None  # compared against to TraceLevel int values
 
-    warn_mode_avoid_normal_bump: Literal["ignore", "warn", "throw"]
-    """
-    Set to 'throw' for strict usage. Using a normal map / bump map / BSDF vector input _can_ be useful,
-    but its always better to do it via the Displacement output of the shader (so that it at least can also be done as displacement)
-    """
-
-    warn_mode_avoid_implicit_vector: Literal["ignore", "warn", "throw"]
-    """
-    Set to 'throw' to force the user to specify exactly what vector to sample.
-    This prevents materials from being incorrect when on a moving object, or ignoring uv coordinates
-    """
-
-    warn_mode_avoid_io_nodes: Literal["ignore", "warn", "throw"]
-    """
-    Set to 'throw' to prevent floating Value Vector Color nodes, or strange output nodes like AOV in shader
-    Intent is to force nodegroups to be more functional - all inputs and outputs go through nodegroup interface
-    """
-
     warn_mode_empty_geonodes: Literal["ignore", "warn", "throw"]
     """
     Controls behavior when a geometry node graph produces no mesh geometry (e.g. unconnected inputs).
@@ -44,16 +26,10 @@ class ProcfuncContext:
 
     def set_strict(self):
         """Set all warning modes to 'throw'"""
-        self.warn_mode_avoid_normal_bump = "throw"
-        self.warn_mode_avoid_implicit_vector = "throw"
-        self.warn_mode_avoid_io_nodes = "throw"
         self.warn_mode_empty_geonodes = "throw"
 
     def set_warn(self):
         """Set all warning modes to 'warn'"""
-        self.warn_mode_avoid_normal_bump = "warn"
-        self.warn_mode_avoid_implicit_vector = "warn"
-        self.warn_mode_avoid_io_nodes = "warn"
         self.warn_mode_empty_geonodes = "warn"
 
 
@@ -61,27 +37,11 @@ class ProcfuncContext:
 
 warn_modes = ["ignore", "warn", "throw"]
 
-_warn_mode_avoid_normal_bump = os.environ.get(
-    "PROCFUNC_WARN_MODE_AVOID_NORMAL_BUMP", "ignore"
-)
-assert _warn_mode_avoid_normal_bump in warn_modes
-
-warn_mode_avoid_implicit_vector = os.environ.get(
-    "PROCFUNC_WARN_MODE_AVOID_IMPLICIT_VECTOR", "ignore"
-)
-assert warn_mode_avoid_implicit_vector in warn_modes
-
-warn_mode_avoid_io_nodes = os.environ.get("PROCFUNC_WARN_MODE_AVOID_IO_NODES", "ignore")
-assert warn_mode_avoid_io_nodes in warn_modes
-
 _warn_mode_empty_geonodes = os.environ.get("PROCFUNC_WARN_MODE_EMPTY_GEONODES", "warn")
 assert _warn_mode_empty_geonodes in warn_modes
 
 globals = ProcfuncContext(
     num_cpu_cores=int(os.environ.get("PROCFUNC_NUM_CPU_CORES", 0)),
-    warn_mode_avoid_normal_bump=_warn_mode_avoid_normal_bump,  # type: ignore[invalid-assignment]
-    warn_mode_avoid_implicit_vector=warn_mode_avoid_implicit_vector,  # type: ignore[invalid-assignment]
-    warn_mode_avoid_io_nodes=warn_mode_avoid_io_nodes,  # type: ignore[invalid-assignment]
     warn_mode_empty_geonodes=_warn_mode_empty_geonodes,  # type: ignore[invalid-assignment]
     current_trace_level=None,
 )

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/control/__init__.py

@@ -127,12 +127,9 @@ def choice(
 ) -> T:
     """
     Args:
-        rng: random number generator
-        weights: list of weights for each option - will be normalized to sum to 1 as a probability distribution
-        options: list of callables to choose from
-        chosen: if not None, use this value instead of choosing randomly. Cannot be traced, but may appear in the output of the tracer.
+        choice_rng: random number generator
+        choice_options: list of (value, weight) tuples; weights are normalized to a probability distribution
         chosen_idx: if not None, use this index instead of choosing randomly. Cannot be traced, but may appear in the output of the tracer.
-        **child_kwargs: keyword arguments to pass to the chosen callable
 
     TODO: this function should really take args and kwargs as tuple & dict, not via expansion
     but this requires our Node to handle cases with pytrees as inputs. Currently it would fail to execute the children if they are hidden in a pytree

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/nodes/execute/construct_standard.py

@@ -320,26 +320,22 @@ def _construct_procnode_standard(
     for input_name, input_py in kwargs.items():
         input_result = input_results[input_name]
         if input_result is None:
-            # Strict-None policy: None means "leave disconnected" and is only
-            # allowed for sockets with no default_value attr at all (Geometry,
-            # Shader, Matrix, Virtual) - never rely on Blender's internal
-            # defaults, whose values may change across versions. A disabled or
-            # missing socket name is a binding bug and propagates as ValueError.
             to_socket = get_input_socket_to_connect_to(
                 bl_node_tree, bl_node, input_name, None
             )
-            # IMAGE default_value is a datablock pointer; None faithfully means "no image assigned"
             if (
                 to_socket.is_multi_input
                 or not hasattr(to_socket, "default_value")
-                or to_socket.type == "IMAGE"
+                or to_socket.hide_value
+                or to_socket.default_value is None
             ):
                 continue
             raise ValueError(
                 f"Node {bl_node.name!r} input {to_socket.name!r} (socket type "
                 f"{to_socket.type}) received None. Explicitly pass a value; None is "
-                f"only allowed for sockets with no default_value attribute "
-                f"(e.g. Geometry/Shader) or with a datablock pointer one (Image)."
+                f"only allowed for disconnected implicit-field sockets (hide_value), "
+                f"datablock pointers, or sockets with no default_value attribute "
+                f"(e.g. Geometry/Shader)."
             )
         to_socket = get_input_socket_to_connect_to(
             bl_node_tree, bl_node, input_name, input_result

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/nodes/execute/util.py

@@ -327,6 +327,8 @@ def assign_default_value(
             target_socket.default_value = t.Vector(input_val)
         case bni.NodeDataType.FLOAT:
             target_socket.default_value = float(input_val)
+        case bni.NodeDataType.INT:
+            target_socket.default_value = int(input_val)
         case bni.NodeDataType.FLOAT_MATRIX:
             # matrix values travel as numpy arrays in the compute graph;
             # coerce back to mathutils.Matrix for bpy

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/nodes/func.py

@@ -6,7 +6,6 @@ from procfunc.nodes import types as nt
 from procfunc.nodes.util.bindings_util import (
     ContextualNode,
     RuntimeResolveDataType,
-    raise_io_error,
 )
 from procfunc.nodes.util.bpy_node_info import NodeDataType
 
@@ -466,8 +465,6 @@ def input_bool(boolean: bool = False) -> t.ProcNode[bool]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/boolean.html
     """
 
-    raise_io_error("input_bool", logger=logger)
-
     return t.ProcNode.from_nodetype(
         node_type="FunctionNodeInputBool",
         inputs={},
@@ -482,8 +479,6 @@ def input_color(value: tuple = (0.5, 0.5, 0.5, 1.0)) -> t.ProcNode[pt.Color]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/color.html
     """
 
-    raise_io_error("input_color", logger=logger)
-
     return t.ProcNode.from_nodetype(
         node_type="FunctionNodeInputColor",
         inputs={},
@@ -498,8 +493,6 @@ def input_int(integer: int = 0) -> t.ProcNode[int]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/integer.html
     """
 
-    raise_io_error("input_int", logger=logger)
-
     return t.ProcNode.from_nodetype(
         node_type="FunctionNodeInputInt",
         inputs={},
@@ -514,8 +507,6 @@ def input_rotation(rotation_euler: tuple = (0.0, 0.0, 0.0)) -> t.ProcNode[pt.Vec
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/rotation.html
     """
 
-    raise_io_error("input_rotation", logger=logger)
-
     return t.ProcNode.from_nodetype(
         node_type="FunctionNodeInputRotation",
         inputs={},
@@ -536,8 +527,6 @@ def input_special_characters() -> InputSpecialCharactersResult:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/utilities/text/special_characters.html
     """
 
-    raise_io_error("input_special_characters", logger=logger)
-
     node = nt.ProcNode.from_nodetype(
         node_type="FunctionNodeInputSpecialCharacters",
         inputs={},
@@ -555,8 +544,6 @@ def input_string(string: str = "") -> nt.ProcNode[str]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/string.html
     """
 
-    raise_io_error("input_string", logger=logger)
-
     return nt.ProcNode.from_nodetype(
         node_type="FunctionNodeInputString",
         inputs={},
@@ -571,8 +558,6 @@ def input_vector(vector: tuple = (0.0, 0.0, 0.0)) -> nt.ProcNode[pt.Vector]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/vector.html
     """
 
-    raise_io_error("input_vector", logger=logger)
-
     return nt.ProcNode.from_nodetype(
         node_type="FunctionNodeInputVector",
         inputs={},

{procfunc-0.33.2 → procfunc-0.34.0}/src/procfunc/nodes/geo.py

@@ -4,7 +4,7 @@ from typing import Generic, Literal, NamedTuple, TypeVar
 
 from procfunc import types as pt
 from procfunc.nodes import types as nt
-from procfunc.nodes.util.bindings_util import RuntimeResolveDataType, raise_io_error
+from procfunc.nodes.util.bindings_util import RuntimeResolveDataType
 from procfunc.nodes.util.bpy_node_info import NodeDataType
 from procfunc.util import pytree
 
@@ -491,22 +491,6 @@ def curve_endpoint_selection(
     )
 
 
-# def curve_handle_type_selection(
-#    handle_type: Literal["FREE", "AUTO", "VECTOR", "ALIGN"] = "AUTO",
-#    mode: Literal["LEFT", "RIGHT"] = "RIGHT",
-# ) -> t.ProcNode:
-#    """
-#    Uses a CurveHandleTypeSelection Geometry Node.
-#
-#    See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/curve/read/handle_type_selection.html
-#    """
-#    return t.ProcNode.from_nodetype(
-#        node_type="GeometryNodeCurveHandleTypeSelection",
-#        inputs={},
-#        attrs={"handle_type": handle_type, "mode": mode},
-#    )
-
-
 def curve_length(curve: nt.ProcNode[pt.CurveObject] | None) -> nt.ProcNode[float]:
     """
     Uses a CurveLength Geometry Node.
@@ -1636,8 +1620,6 @@ def input_active_camera() -> nt.ProcNode[pt.Object]:
 
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/scene/active_camera.html
     """
-    raise_io_error("input_active_camera", logger=logger)
-
     return nt.ProcNode.from_nodetype(
         node_type="GeometryNodeInputActiveCamera",
         inputs={},
@@ -1712,7 +1694,6 @@ def input_image(image: pt.Image | None = None) -> nt.ProcNode[pt.Image]:
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/image.html
     """
 
-    raise_io_error("input_image", logger=logger)
     return nt.ProcNode.from_nodetype(
         node_type="GeometryNodeInputImage",
         inputs={},
@@ -1765,8 +1746,6 @@ def input_material(material: pt.Material | None = None) -> nt.ProcNode[pt.Materi
 
     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/input/constant/material.html
     """
-    raise_io_error("input_material", logger=logger)
-
     return nt.ProcNode.from_nodetype(
         node_type="GeometryNodeInputMaterial",
         inputs={},
@@ -2160,7 +2139,7 @@ def instance_transform() -> nt.ProcNode:
 
 
 def instances_to_points(
-    position: nt.SocketOrVal[nt.pt.Vector],
+    position: nt.SocketOrVal[nt.pt.Vector] | None,
     instances: nt.ProcNode[nt.Instances] | None,
     selection: nt.SocketOrVal[bool] = True,
     radius: nt.SocketOrVal[float] = 0.05,
@@ -2685,7 +2664,7 @@ def mesh_to_density_grid(
 
 def mesh_to_points(
     mesh: nt.ProcNode[pt.MeshObject] | None,
-    position: nt.SocketOrVal[nt.pt.Vector],
+    position: nt.SocketOrVal[nt.pt.Vector] | None = None,
     selection: nt.SocketOrVal[bool] = True,
     radius: nt.SocketOrVal[float] = 0.05,
     mode: Literal["VERTICES", "EDGES", "FACES", "CORNERS"] = "VERTICES",
@@ -3480,7 +3459,7 @@ def sample_uv_surface(
 def scale_elements(
     geometry: nt.ProcNode[nt.Geometry] | None,
     scale: nt.SocketOrVal[float],
-    center: nt.SocketOrVal[nt.pt.Vector],
+    center: nt.SocketOrVal[nt.pt.Vector] | None = None,
     selection: nt.SocketOrVal[bool] = True,
     axis: nt.SocketOrVal[nt.pt.Vector] | None = None,
     domain: Literal["FACE", "EDGE"] = "FACE",
@@ -4465,32 +4444,6 @@ TViewer = TypeVar(
 )
 
 
-# def viewer(
-#     geometry: t.ProcNode[t.Geometry],
-#     value: TViewer = 0,
-#     domain: TDomain = "AUTO",
-#     data_type: NodeDataType | RuntimeResolveDataType | None = None,
-# ) -> t.ProcNode:
-#     """
-#     Uses a Viewer Geometry Node.
-#
-#     See: https://docs.blender.org/manual/en/4.2/modeling/geometry_nodes/output/viewer.html
-#     """
-#     if data_type is None:
-#         data_type = RuntimeResolveDataType(
-#             [NodeDataType.BOOLEAN, NodeDataType.INT, NodeDataType.FLOAT],
-#             ["Value"],
-#         )
-#     return t.ProcNode.from_nodetype(
-#         node_type="GeometryNodeViewer",
-#         inputs={"Geometry": geometry, "Value": value},
-#         attrs={
-#             "domain": domain,
-#             "data_type": data_type,
-#         },
-#     )
-
-
 class ViewportTransformResult(NamedTuple):
     projection: nt.ProcNode
     view: nt.ProcNode