feat: update node settings, handle format string items

Author: BrendanParmer

NodeToPython/node_settings.py

@@ -26,6 +26,7 @@ class ST(Enum):
 	FOREACH_GEO_ELEMENT_GENERATION_ITEMS = auto()
 	FOREACH_GEO_ELEMENT_INPUT_ITEMS = auto()
 	FOREACH_GEO_ELEMENT_MAIN_ITEMS = auto()
+	FORMAT_STRING_ITEMS = auto()
 	INDEX_SWITCH_ITEMS = auto()
 	MENU_SWITCH_ITEMS = auto()
 	NODE_TREE = auto()
@@ -410,9 +411,7 @@ class NodeInfo(NamedTuple):
 	),
 
 	'CompositorNodeDisplace' : NodeInfo(
-		[
-			NTPNodeSetting("interpolation", ST.ENUM, min_version_=(5, 0, 0)),
-		]
+		[]
 	),
 
 	'CompositorNodeDistanceMatte' : NodeInfo(
@@ -465,17 +464,17 @@ class NodeInfo(NamedTuple):
 
 	'CompositorNodeGlare' : NodeInfo(
 		[
-			NTPNodeSetting("angle_offset", ST.FLOAT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("color_modulation", ST.FLOAT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("fade", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("angle_offset", ST.FLOAT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("color_modulation", ST.FLOAT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("fade", ST.FLOAT, max_version_=(4, 4, 0)),
 			NTPNodeSetting("glare_type", ST.ENUM),
-			NTPNodeSetting("iterations", ST.INT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("mix", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("iterations", ST.INT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("mix", ST.FLOAT, max_version_=(4, 4, 0)),
 			NTPNodeSetting("quality", ST.ENUM),
-			NTPNodeSetting("size", ST.INT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("streaks", ST.INT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("threshold", ST.FLOAT, max_version_=(4, 5, 0)),
-			NTPNodeSetting("use_rotate_45", ST.BOOL, max_version_=(4, 5, 0)),
+			NTPNodeSetting("size", ST.INT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("streaks", ST.INT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("threshold", ST.FLOAT, max_version_=(4, 4, 0)),
+			NTPNodeSetting("use_rotate_45", ST.BOOL, max_version_=(4, 4, 0)),
 		]
 	),
 
@@ -848,13 +847,13 @@ class NodeInfo(NamedTuple):
 
 	'CompositorNodeTonemap' : NodeInfo(
 		[
-			NTPNodeSetting("adaptation", ST.FLOAT),
-			NTPNodeSetting("contrast", ST.FLOAT),
-			NTPNodeSetting("correction", ST.FLOAT),
-			NTPNodeSetting("gamma", ST.FLOAT),
-			NTPNodeSetting("intensity", ST.FLOAT),
-			NTPNodeSetting("key", ST.FLOAT),
-			NTPNodeSetting("offset", ST.FLOAT),
+			NTPNodeSetting("adaptation", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("contrast", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("correction", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("gamma", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("intensity", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("key", ST.FLOAT, max_version_=(4, 5, 0)),
+			NTPNodeSetting("offset", ST.FLOAT, max_version_=(4, 5, 0)),
 			NTPNodeSetting("tonemap_type", ST.ENUM),
 		]
 	),
@@ -1013,6 +1012,7 @@ class NodeInfo(NamedTuple):
 	'FunctionNodeFormatString' : NodeInfo(
 		[
 			NTPNodeSetting("active_index", ST.INT),
+			NTPNodeSetting("format_items", ST.FORMAT_STRING_ITEMS),
 		],
 		min_version_ = (4, 5, 0)
 	),
@@ -2805,9 +2805,7 @@ class NodeInfo(NamedTuple):
 	),
 
 	'GeometryNodeUVPackIslands' : NodeInfo(
-		[
-			NTPNodeSetting("shape_method", ST.ENUM, min_version_=(5, 0, 0)),
-		],
+		[],
 		min_version_ = (3, 3, 0)
 	),
 
@@ -3391,16 +3389,16 @@ class NodeInfo(NamedTuple):
 			NTPNodeSetting("air_density", ST.FLOAT),
 			NTPNodeSetting("altitude", ST.FLOAT),
 			NTPNodeSetting("dust_density", ST.FLOAT),
-			NTPNodeSetting("ground_albedo", ST.FLOAT, max_version_=(5, 0, 0)),
+			NTPNodeSetting("ground_albedo", ST.FLOAT),
 			NTPNodeSetting("ozone_density", ST.FLOAT),
 			NTPNodeSetting("sky_type", ST.ENUM),
-			NTPNodeSetting("sun_direction", ST.VEC3, max_version_=(5, 0, 0)),
+			NTPNodeSetting("sun_direction", ST.VEC3),
 			NTPNodeSetting("sun_disc", ST.BOOL),
 			NTPNodeSetting("sun_elevation", ST.FLOAT),
 			NTPNodeSetting("sun_intensity", ST.FLOAT),
 			NTPNodeSetting("sun_rotation", ST.FLOAT),
 			NTPNodeSetting("sun_size", ST.FLOAT),
-			NTPNodeSetting("turbidity", ST.FLOAT, max_version_=(5, 0, 0)),
+			NTPNodeSetting("turbidity", ST.FLOAT),
 		]
 	),
 

NodeToPython/ntp_operator.py

@@ -454,6 +454,8 @@ def _set_settings_defaults(self, node: Node) -> None:
                 self._foreach_geo_element_input_items(attr, f"{node_var}.{attr_name}")
             elif st == ST.FOREACH_GEO_ELEMENT_MAIN_ITEMS:
                 self._foreach_geo_element_main_items(attr, f"{node_var}.{attr_name}")
+            elif st == ST.FORMAT_STRING_ITEMS:
+                self._format_string_items(attr, f"{node_var}.{attr_name}")
 
     if bpy.app.version < (4, 0, 0):
         def _set_group_socket_defaults(self, socket_interface: NodeSocketInterface,
@@ -1349,6 +1351,16 @@ def _foreach_geo_element_main_items(self,
                 name_str = str_to_py_str(item.name)
                 self._write(f"{main_items_str}.new({socket_type}, {name_str})")
 
+    if bpy.app.version >= (4, 5, 0):
+        def _format_string_items(self,
+                          format_items : bpy.types.NodeFunctionFormatStringItems,
+                          format_items_str: str) -> None:
+            self._write(f"{format_items_str}.clear()")
+            for i, item in enumerate(format_items):
+                socket_type = enum_to_py_str(item.socket_type)
+                name_str = str_to_py_str(item.name)
+                self._write(f"{format_items_str}.new({socket_type}, {name_str})")
+
 
     def _set_parents(self, node_tree: NodeTree) -> None:
         """