Target Blender 5.1+ (#50)

* update for bpy>=5.1

* cleanup PCA logic

* update tests

* cleanup and improve socket accessor methods

* more cleanup of VectorSocket accessor

* more socket helpers

* cleanup interface SocketValue return

* type returns for math operations

* typing for >> operator

* cleanup more types

* cleanup of default value and name normalisation

* cleanup tests

* Expose Frame node and context for frames

* ruff format

* more tests

* test coverage

* test coverage

* test coverage

* test coverage

* test coverage

* update changelog

Author: BradyAJohnston

.github/workflows/tests.yml

@@ -13,7 +13,6 @@ jobs:
       max-parallel: 4
       fail-fast: false
       matrix:
-        version: ["5.0"]
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v4
@@ -26,19 +25,18 @@ jobs:
       - name: Install
         run: |
           uv sync  --all-extras --dev
-          uv pip install bpy~=${{ matrix.version }}
 
       - name: Run tests
         run: |
           uv run -m pytest -n auto -vv --cov=nodebpy --cov-report=xml
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v5
-        if: matrix.os == 'macos-latest' && matrix.version == '5.0'
+        if: matrix.os == 'macos-latest'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: coverage.xml
 
       - name: Upload coverage reports to Codecov
-        if: matrix.os == 'macos-latest' && matrix.version == '5.0'
+        if: matrix.os == 'macos-latest'
         uses: codecov/codecov-action@v3

.python-version

@@ -1 +1 @@
-3.11
+3.13

docs/changelog.qmd

@@ -16,7 +16,17 @@ mat = g.InstanceTransform().o.transform
 
 vec = g.CombineXYZ(*mat[:3])
 ```
+- **Socket iteration and indexing** — `VectorSocket`, `ColorSocket`, and `MatrixSocket` now support `__getitem__`, `__iter__`, and `__len__`. Output sockets decompose via `SeparateXYZ`/`SeparateColor`/`SeparateMatrix` (node reuse on repeated access); input sockets auto-wire a `CombineXYZ`/`CombineColor`/`CombineMatrix` and return the component input. Enables patterns like `for axis in vec_socket` and `value >> node.i.position[1]`.
+- **`RotationSocket`/`MatrixSocket` helpers** — Added `.invert` and `.transpose` properties on `MatrixSocket`, `.invert` on `RotationSocket`, following the same node-reuse pattern as `.x`/`.y`/`.z`.
+- **`SocketAccessor` overloads** — `__getitem__` and `_get` are overloaded so slices return `list[Socket]` and str/int keys return `Socket`, eliminating the `Socket | list[Socket]` union that was blocking `enumerate` and unpacking.
+- **Blender 5.1 compatibility** — Generator updated for Blender 5.1: `FontSocket` type, `Frame` node moved to `manually_defined`, `SVD` class name normalisation, and classmethod param deduplication fix (`min_x`/`min_y`/`min_z` no longer collapsed to `min`).
+
+### Bug Fixes
+- **Generic factory nodes** — `AccumulateField`, `EvaluateAtIndex`, `FieldAverage`, `FieldMinAndMax`, `EvaluateOnDomain`, `FieldVariance`, and `Compare` are now `Generic[_T]`. Their `_Inputs`/`_Outputs` inner classes carry the type parameter so `.point.vector(...)` returns `FieldAverage[VectorSocket]` and `.o.mean` resolves to `VectorSocket`.
+- **Precise operator return types** — Arithmetic operators on `FloatSocket` → `Math`, `VectorSocket` → `VectorMath`, `IntegerSocket` → `IntegerMath`. Comparison operators (`<`, `>`, `<=`, `>=`, `==`, `!=`) → `Compare`. The `>>` operator is now typed via `TypeVar` so the right-hand operand's exact type is preserved through chains.
 - Fix doc building and will only deploy on tagged releases([#49](https://github.com/BradyAJohnston/nodebpy/pull/49))
+- **Domain factory pattern** — All `_domain_factory` / local-class patterns replaced with proper `_DomainFactory` inner classes (including `CaptureAttribute`) so the type checker can see their return types.
+- **`SocketAccessor` identifier lookup fix** — Added a normalised-identifier pass (`normalize_name(id)`) so attribute access like `.i.value_001` correctly resolves Blender identifiers such as `Value_001` that cannot be round-tripped through `denormalize_name`.
 
 ## v0.10.2 - 2026-04-21
 

generate.py

@@ -17,7 +17,7 @@
 from typing import Any, Literal
 
 import bpy
-from bpy.types import bpy_prop_array
+from bpy.types import VectorFont, bpy_prop_array
 from mathutils import Euler, Vector
 
 # ---------------------------------------------------------------------------
@@ -49,6 +49,7 @@
     "NodeSocketBundle": "BundleSocket",
     "NodeSocketClosure": "ClosureSocket",
     "NodeSocketShader": "ShaderSocket",
+    "NodeSocketFont": "FontSocket",
 }
 
 
@@ -78,7 +79,6 @@ def output_dir(self) -> Path:
         "Closure",
         "Simulation",
         "For Each",
-        "Frame",
         "GridBoolean",
         "Reroute",
         "FieldMinAndMax",
@@ -118,6 +118,7 @@ def output_dir(self) -> Path:
         "FieldVariance",
         "Compare",
         "AttributeStatistic",
+        "Frame",
         "tree",
     ),
     class_name_prefix_strips=[
@@ -133,7 +134,6 @@ def output_dir(self) -> Path:
     output_dir_name="shader",
     nodes_to_skip=[
         "Legacy",
-        "Frame",
         "Reroute",
     ],
     manually_defined=(
@@ -142,6 +142,7 @@ def output_dir(self) -> Path:
         "RepeatOutput",
         "RepeatZone",
         "Attribute",
+        "Frame",
         "tree",
         "material",
     ),
@@ -156,13 +157,13 @@ def output_dir(self) -> Path:
     output_dir_name="compositor",
     nodes_to_skip=[
         "Legacy",
-        "Frame",
         "Reroute",
         "Cryptomatte",
         "Image",
     ],
     manually_defined=(
         "MenuSwitch",
+        "Frame",
         "tree",
     ),
     class_name_prefix_strips=[
@@ -231,6 +232,7 @@ def type_mapped(self) -> str:
             "NodeSocketClosure": "InputClosure",
             # Shader trees use NodeSocketShader for BSDF/closure outputs
             "NodeSocketShader": "InputShader",
+            "NodeSocketFont": "InputFont",
             # Virtual sockets adapt to whatever is connected
             "NodeSocketVirtual": "InputLinkable",
         }
@@ -405,6 +407,7 @@ def class_name_for_config(self, config: TreeTypeConfig) -> str:
             "Vdb": "VDB",
             "3DLocation": "Location3D",
             "Bsdf": "BSDF",
+            "Svd": "SVD",
         }
 
         # Add prefix strips from config
@@ -518,13 +521,12 @@ def generate_enum_class_methods(self, config: TreeTypeConfig | None = None) -> s
                 for socket in enum.sockets:
                     # Use label-based parameter naming
                     socket_name = get_socket_param_name(socket, sockets_use_same_name)
-                    if socket_name.startswith("min"):
-                        param_name = "min"
-                    elif socket_name.startswith("max"):
-                        param_name = "max"
-                    else:
-                        param_name = socket_name
-                    param_name = param_name.replace("_float", "").replace("_vector", "")
+                    suffixes_to_remove = ["_float", "_vector"]
+                    param_name = socket_name
+                    if socket_name.startswith("min") or socket_name.startswith("max"):
+                        suffixes_to_remove += ["_001", "_002"]
+                    for suffix in suffixes_to_remove:
+                        param_name = param_name.replace(suffix, "")
 
                     if (
                         param_name
@@ -591,13 +593,12 @@ def {method_name}(
 
             for socket in enum.sockets:
                 socket_name = get_socket_param_name(socket, sockets_use_same_name)
-                if socket_name.startswith("min"):
-                    param_name = "min"
-                elif socket_name.startswith("max"):
-                    param_name = "max"
-                else:
-                    param_name = socket_name
-                param_name = param_name.replace("_float", "").replace("_vector", "")
+                suffixes_to_remove = ["_float", "_vector"]
+                param_name = socket_name
+                if socket_name.startswith("min") or socket_name.startswith("max"):
+                    suffixes_to_remove += ["_001", "_002"]
+                for suffix in suffixes_to_remove:
+                    param_name = param_name.replace(suffix, "")
 
                 if param_name and param_name != "" and param_name != type_param_name:
                     input_params.append(
@@ -682,6 +683,8 @@ def format_python_value(value: Any) -> str:
         return str(value)
     elif isinstance(value, int):
         return str(value)
+    elif isinstance(value, VectorFont):
+        return "None"
     elif isinstance(value, float):
         return str(round(value, 4))
     elif hasattr(value, "__iter__") and not isinstance(value, str):
@@ -1221,6 +1224,7 @@ def _check_socket(socket):
         "InputString",
         "InputFloat",
         "InputVector",
+        "InputFont",
     ]
     type_imports = [
         t

pyproject.toml

@@ -6,7 +6,7 @@ readme = "README.md"
 authors = [
     { name = "Brady Johnston", email = "brady.johnston@me.com" }
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 license = { text = "GPL-3.0-or-later" }
 
 [project.scripts]
@@ -17,7 +17,7 @@ networkx = [
     "networkx>=3.6.1",
 ]
 bpy = [
-    "bpy>=5.0.1",
+    "bpy>=5.1.0",
 ]
 
 [build-system]

src/nodebpy/builder/__init__.py

@@ -35,6 +35,7 @@
     CollectionSocket,
     ColorSocket,
     FloatSocket,
+    FontSocket,
     GeometrySocket,
     ImageSocket,
     IntegerSocket,
@@ -93,6 +94,7 @@
     "MenuSocket",
     "GeometrySocket",
     "ObjectSocket",
+    "FontSocket",
     "MaterialSocket",
     "ImageSocket",
     "CollectionSocket",
@@ -120,6 +122,7 @@
     "SocketMenu",
     "SocketObject",
     "SocketGeometry",
+    "SocketFont",
     "SocketCollection",
     "SocketImage",
     "SocketMaterial",

src/nodebpy/builder/accessor.py

@@ -6,7 +6,12 @@
 from bpy.types import NodeSocket
 
 from ._registry import _get_socket_linker
-from ._utils import SocketError, _allow_innactive_sockets, denormalize_name
+from ._utils import (
+    SocketError,
+    _allow_innactive_sockets,
+    denormalize_name,
+    normalize_name,
+)
 
 if TYPE_CHECKING:
     from .socket import Socket
@@ -43,6 +48,10 @@ def _index(self, key: str | int) -> int:
         for candidate in (key, denorm):
             if candidate in ids:
                 return ids.index(candidate)
+        # Normalized identifier match: 'value_001' matches identifier 'Value_001'
+        normalized_ids = [normalize_name(id) for id in ids]
+        if key in normalized_ids:
+            return normalized_ids.index(key)
         names = [s.name for s in self._collection]
         for key in (key, denorm):
             if key in names:

src/nodebpy/builder/mixins.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 from types import EllipsisType
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from bpy.types import NodeLink, NodeSocket
 
 from ._registry import _get_socket_linker
 from ._utils import SocketError, _resolve_promotion, _SocketLike
 
+_RShiftT = TypeVar("_RShiftT")
+
 if TYPE_CHECKING:
+    from ..nodes.geometry import Compare, Math
     from ..types import InputLinkable
     from .node import BaseNode
     from .socket import Socket
@@ -26,97 +29,97 @@ class OperatorMixin:
 
     def _apply_math_operation(
         self, other: Any, operation: str, reverse: bool = False
-    ) -> "BaseNode":
+    ) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
             reverse,  # type: ignore[attr-defined]
         )
         return _get_socket_linker(socket)._dispatch_math(other, operation, reverse)
 
-    def __mul__(self, other: Any) -> "BaseNode":
+    def __mul__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "multiply")
 
-    def __rmul__(self, other: Any) -> "BaseNode":
+    def __rmul__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "multiply", reverse=True)
 
-    def __truediv__(self, other: Any) -> "BaseNode":
+    def __truediv__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "divide")
 
-    def __rtruediv__(self, other: Any) -> "BaseNode":
+    def __rtruediv__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "divide", reverse=True)
 
-    def __add__(self, other: Any) -> "BaseNode":
+    def __add__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "add")
 
-    def __radd__(self, other: Any) -> "BaseNode":
+    def __radd__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "add", reverse=True)
 
-    def __sub__(self, other: Any) -> "BaseNode":
+    def __sub__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "subtract")
 
-    def __rsub__(self, other: Any) -> "BaseNode":
+    def __rsub__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "subtract", reverse=True)
 
-    def __pow__(self, other: Any) -> "BaseNode":
+    def __pow__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "power")
 
-    def __rpow__(self, other: Any) -> "BaseNode":
+    def __rpow__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "power", reverse=True)
 
-    def __mod__(self, other: Any) -> "BaseNode":
+    def __mod__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "modulo")
 
-    def __rmod__(self, other: Any) -> "BaseNode":
+    def __rmod__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "modulo", reverse=True)
 
-    def __floordiv__(self, other: Any) -> "BaseNode":
+    def __floordiv__(self, other: Any) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
             False,  # type: ignore[attr-defined]
         )
         return _get_socket_linker(socket)._dispatch_floordiv(other, reverse)
 
-    def __rfloordiv__(self, other: Any) -> "BaseNode":
+    def __rfloordiv__(self, other: Any) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
             True,  # type: ignore[attr-defined]
         )
         return _get_socket_linker(socket)._dispatch_floordiv(other, reverse)
 
-    def __neg__(self) -> "BaseNode":
+    def __neg__(self) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_unary(  # type: ignore[attr-defined]
             "negate"
         )
 
-    def __abs__(self) -> "BaseNode":
+    def __abs__(self) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_unary(  # type: ignore[attr-defined]
             "absolute"
         )
 
-    def _apply_compare_operation(self, other: Any, operation: str) -> "BaseNode":
+    def _apply_compare_operation(self, other: Any, operation: str) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_compare(  # type: ignore[attr-defined]
             other, operation
         )
 
-    def __lt__(self, other: Any) -> "BaseNode":
+    def __lt__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "less_than")
 
-    def __gt__(self, other: Any) -> "BaseNode":
+    def __gt__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "greater_than")
 
-    def __le__(self, other: Any) -> "BaseNode":
+    def __le__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "less_equal")
 
-    def __ge__(self, other: Any) -> "BaseNode":
+    def __ge__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "greater_equal")
 
-    def __eq__(self, other: Any) -> "BaseNode":  # type: ignore[override]
+    def __eq__(self, other: Any) -> "Compare":  # type: ignore[override]
         return self._apply_compare_operation(other, "equal")
 
-    def __ne__(self, other: Any) -> "BaseNode":  # type: ignore[override]
+    def __ne__(self, other: Any) -> "Compare":  # type: ignore[override]
         return self._apply_compare_operation(other, "not_equal")
 
     def _apply_boolean_operation(self, other: Any, operation: str):