Fix Ruff UP034 (extraneous-parentheses)

https://docs.astral.sh/ruff/rules/extraneous-parentheses/

src/bonsai/bonsai/bim/module/bcf/operator.py

@@ -397,7 +397,7 @@ class AddBcfBimSnippet(bpy.types.Operator):
     def poll(cls, context):
         props = tool.Bcf.get_bcf_props()
         props_are_filled = all(
-            (getattr(props, attr) for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type"))
+            getattr(props, attr) for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type")
         )
         if not props_are_filled:
             cls.poll_message_set("Some BIM snippet fields are empty.")

src/bonsai/bonsai/bim/module/geometry/operator.py

@@ -724,7 +724,7 @@ class GetRepresentationIfcParameters(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         obj = context.active_object
-        assert obj and tool.Geometry.has_mesh_properties((data := obj.data))
+        assert obj and tool.Geometry.has_mesh_properties(data := obj.data)
         core.get_representation_ifc_parameters(tool.Geometry, obj=obj)
         parameters = tool.Geometry.get_mesh_props(data).ifc_parameters
         self.report({"INFO"}, f"{len(parameters)} parameters found.")
@@ -1691,7 +1691,7 @@ class OverrideJoin(bpy.types.Operator, tool.Ifc.Operator):
                 if obj == self.target:
                     continue
                 if obj.type != self.target_type:
-                    obj.select_set((False))
+                    obj.select_set(False)
                     continue
                 element = tool.Ifc.get_entity(obj)
 
@@ -1752,7 +1752,7 @@ class OverrideJoin(bpy.types.Operator, tool.Ifc.Operator):
                         copied_item = ifcopenshell.util.element.copy_deep(
                             ifc_file, item, exclude=("IfcCartesianPointList",)
                         )
-                        new_points = processed_point_lists.get((points := item.Points))
+                        new_points = processed_point_lists.get(points := item.Points)
                         if new_points is None:
                             new_points = ifcopenshell.util.element.copy_deep(ifc_file, points)
                             dim = item.Dim
@@ -2365,7 +2365,7 @@ class EnableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
                 item.tags += ","
             item.tags += tag
 
-        if tool.Geometry.has_mesh_properties((data := obj.data)):
+        if tool.Geometry.has_mesh_properties(data := obj.data):
             representation = tool.Geometry.get_data_representation(data)
             assert representation
 

src/bonsai/bonsai/bim/module/project/prop.py

@@ -435,7 +435,7 @@ class BIMProjectProperties(PropertyGroup):
         return new
 
     def get_library_element_index(self, lib_element: LibraryElement) -> int:
-        return next((i for i in range(len(self.library_elements)) if self.library_elements[i] == lib_element))
+        return next(i for i in range(len(self.library_elements)) if self.library_elements[i] == lib_element)
 
     if TYPE_CHECKING:
         is_editing: bool

src/bonsai/bonsai/bim/module/qto/helper.py

@@ -27,11 +27,11 @@ def calculate_height(obj: bpy.types.Object) -> float:
 
 
 def calculate_edges_lengths(objs: list[bpy.types.Object], context: bpy.types.Context):
-    return calculate_mesh_quantity(objs, context, lambda bm: sum((e.calc_length() for e in bm.edges if e.select)))
+    return calculate_mesh_quantity(objs, context, lambda bm: sum(e.calc_length() for e in bm.edges if e.select))
 
 
 def calculate_faces_areas(objs: list[bpy.types.Object], context: bpy.types.Context) -> float:
-    return calculate_mesh_quantity(objs, context, lambda bm: sum((f.calc_area() for f in bm.faces if f.select)))
+    return calculate_mesh_quantity(objs, context, lambda bm: sum(f.calc_area() for f in bm.faces if f.select))
 
 
 def calculate_volumes(objs: list[bpy.types.Object], context: bpy.types.Context) -> float:

src/bonsai/bonsai/bim/module/structural/load_decoration_data.py

@@ -398,12 +398,12 @@ class ShaderInfo:
         returns a numpy array with the sum of the values of structural activities
         applied loads in each direction, multiplied by the factors in load combinations
         """
-        values = np.zeros((3))
+        values = np.zeros(3)
         for item in activity_list:
             activity = item[0]
             factor = item[1]
             load = activity.AppliedLoad
-            temp = np.zeros((3))
+            temp = np.zeros(3)
             if load is not None and load.is_a("IfcStructuralLoadPlanarForce"):
                 temp[0] = load.PlanarForceX if load.PlanarForceX is not None else 0
                 temp[1] = load.PlanarForceY if load.PlanarForceY is not None else 0

src/bonsai/bonsai/tool/cad.py

@@ -103,8 +103,8 @@ class Cad:
         d2 = v3 - v2
 
         # Rounding avoids problems when dealing with 180 degrees
-        d1 = Vector((round(c, 6) for c in d1))
-        d2 = Vector((round(c, 6) for c in d2))
+        d1 = Vector(round(c, 6) for c in d1)
+        d2 = Vector(round(c, 6) for c in d2)
 
         d1.normalize()
         d2.normalize()

src/bonsai/bonsai/tool/drawing.py

@@ -1709,7 +1709,7 @@ class Drawing(bonsai.core.tool.Drawing):
         a_quaternion = a.matrix_world.to_quaternion()
         b_quaternion = b.matrix_world.to_quaternion()
         for axis in axes:
-            if abs((a_quaternion @ axis).angle((b_quaternion @ axis)) - (math.pi / 2)) < 1e-5:
+            if abs((a_quaternion @ axis).angle(b_quaternion @ axis) - (math.pi / 2)) < 1e-5:
                 return True
         return False
 

src/bonsai/bonsai/tool/misc.py

@@ -73,7 +73,7 @@ class Misc(bonsai.core.tool.Misc):
         assert isinstance(obj.data, bpy.types.Mesh)
         obj.data.transform(
             Matrix.Translation(
-                (obj.matrix_world.inverted().to_quaternion() @ (obj.matrix_world.translation - new_origin))
+                obj.matrix_world.inverted().to_quaternion() @ (obj.matrix_world.translation - new_origin)
             )
         )
         obj.matrix_world.translation = new_origin

src/bonsai/bonsai/tool/root.py

@@ -445,7 +445,7 @@ class Root(bonsai.core.tool.Root):
         to unlink them.
         """
         tool.Ifc.unlink(obj=obj)
-        if tool.Geometry.has_mesh_properties((data := obj.data)):
+        if tool.Geometry.has_mesh_properties(data := obj.data):
             tool.Geometry.get_mesh_props(data).ifc_definition_id = 0
         for material_slot in obj.material_slots:
             if material := material_slot.material:

src/bonsai/scripts/dxf2ifc.py

@@ -38,7 +38,7 @@ class Dxf2Ifc:
                                 self.file.createIfcFaceOuterBound(
                                     self.file.createIfcPolyLoop(
                                         [
-                                            self.file.createIfcCartesianPoint((face[index].dxf.location))
+                                            self.file.createIfcCartesianPoint(face[index].dxf.location)
                                             for index in range(len(face) - 1)
                                         ]
                                     ),

src/bonsai/scripts/generate_demo_library.py

@@ -81,7 +81,7 @@ def sync_guids(target_file: ifcopenshell.file, source_file: ifcopenshell.file) -
                 # New type with material was added.
                 print(f"WARNING! Couldn't find a matching rel for '{rel}'.")
                 return
-            rel_ = next((r for r in related_object_.HasAssociations if r.is_a("IfcRelAssociatesMaterial")))
+            rel_ = next(r for r in related_object_.HasAssociations if r.is_a("IfcRelAssociatesMaterial"))
             assert rel_
             rel.GlobalId = rel_.GlobalId
         elif rel.is_a("IfcRelDeclares"):

src/bonsai/test/bim/test_feature.py

@@ -1134,7 +1134,7 @@ def the_object_name_should_display_as_mode(name, mode):
 def the_object_name_is_voided_by_void(name, void):
     ifc = tool.Ifc.get()
     element = ifc.by_id(tool.Blender.get_ifc_definition_id(the_object_name_exists(name)))
-    assert any((rel for rel in element.HasOpenings if rel.RelatedOpeningElement.Name == void)), "No void found"
+    assert any(rel for rel in element.HasOpenings if rel.RelatedOpeningElement.Name == void), "No void found"
 
 
 @then(parsers.parse('the object "{name}" is not voided by "{void}"'))
@@ -1158,7 +1158,7 @@ def the_object_name_is_a_void(name):
     ifc = tool.Ifc.get()
     obj = the_object_name_exists(name)
     element = ifc.by_id(tool.Blender.get_ifc_definition_id(obj))
-    assert any((element.VoidsElements)), "No void was found"
+    assert any(element.VoidsElements), "No void was found"
 
 
 @then(parsers.parse('the object "{name}" is not a void'))
@@ -1282,7 +1282,7 @@ def the_object_name_is_filled_by_filling(name, name2):
 def the_void_name_is_filled_by_filling(name, filling):
     ifc = tool.Ifc.get()
     element = ifc.by_id(tool.Blender.get_ifc_definition_id(the_object_name_exists(name)))
-    assert any((rel.RelatedBuildingElement.Name == filling for rel in element.HasFillings)), "No filling found"
+    assert any(rel.RelatedBuildingElement.Name == filling for rel in element.HasFillings), "No filling found"
 
 
 @then(parsers.parse('the void "{name}" is not filled by "{filling}"'))
@@ -1468,7 +1468,7 @@ def the_object_name_has_a_vertex_at_location(name, location):
     target = Vector([float(co) for co in location.split(",")])
     verts = []
     for v in obj.data.vertices:
-        verts.append((obj.matrix_world @ v.co))
+        verts.append(obj.matrix_world @ v.co)
         if (verts[-1] - target).length < 0.001:
             is_pass = True
     assert is_pass, f"No verts found at {location}: {verts}"

src/bonsai/test/tool/test_loader.py

@@ -71,7 +71,7 @@ class TestCreatingStyles(NewFile):
         subject.create_surface_style_with_textures(material, style_data, texture_data)
 
         used_node_types = set([n.type for n in material.node_tree.nodes[:]])
-        assert used_node_types == set((["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"]))
+        assert used_node_types == set(["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"])
 
         bsdf = tool.Blender.get_material_node(material, "BSDF_PRINCIPLED")
         alpha = 1 - style_data["Transparency"]
@@ -137,7 +137,7 @@ class TestCreatingStyles(NewFile):
         subject.create_surface_style_with_textures(material, rendering_style, texture_style)
 
         used_node_types = set([n.type for n in material.node_tree.nodes[:]])
-        assert used_node_types == set((["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"]))
+        assert used_node_types == set(["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"])
 
         color_to_tuple = lambda x: (x.Red, x.Green, x.Blue)
         bsdf = tool.Blender.get_material_node(material, "BSDF_PRINCIPLED")
@@ -250,7 +250,7 @@ class TestCreatingStyles(NewFile):
         subject.create_surface_style_with_textures(material, rendering_style, texture_style)
 
         used_node_types = set([n.type for n in material.node_tree.nodes[:]])
-        assert used_node_types == set((["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"]))
+        assert used_node_types == set(["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"])
 
         image_node = tool.Blender.get_material_node(material, "TEX_IMAGE")
         assert image_node.outputs["Color"].links[0].to_socket.name == "Base Color"
@@ -385,7 +385,7 @@ class TestCreatingStyles(NewFile):
         subject.create_surface_style_with_textures(material, rendering_style, texture_style)
 
         used_node_types = set([n.type for n in material.node_tree.nodes[:]])
-        assert used_node_types == set((["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"]))
+        assert used_node_types == set(["OUTPUT_MATERIAL", "BSDF_PRINCIPLED", "TEX_IMAGE", "TEX_COORD"])
 
         image_node = tool.Blender.get_material_node(material, "TEX_IMAGE")
         assert image_node.outputs["Color"].links[0].to_socket.name == "Base Color"

src/bonsai/test/tool/test_model.py

@@ -489,14 +489,14 @@ class TestApplyIfcMaterialChanges(NewFile):
         sprops = tool.Style.get_style_props()
         sprops.style_name = "Red"
         bpy.ops.bim.add_presentation_style()
-        red_style = next((i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Red"))
+        red_style = next(i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Red")
         ifcopenshell.api.style.assign_material_style(ifc_file, red_material, red_style, context)
 
         blue_material = ifcopenshell.api.material.add_material(ifc_file, "Blue Material")
         bpy.ops.bim.enable_adding_presentation_style()
         sprops.style_name = "Blue"
         bpy.ops.bim.add_presentation_style()
-        blue_style = next((i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Blue"))
+        blue_style = next(i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Blue")
         ifcopenshell.api.style.assign_material_style(ifc_file, blue_material, blue_style, context)
 
         bpy.ops.bim.enable_adding_presentation_style()
@@ -508,7 +508,7 @@ class TestApplyIfcMaterialChanges(NewFile):
 
     def setup_elements(self) -> None:
         ifc_file = tool.Ifc.get()
-        blue_material = next((i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Blue Material"))
+        blue_material = next(i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Blue Material")
         blue_style = tool.Material.get_style(blue_material)
 
         # Element type.
@@ -552,9 +552,9 @@ class TestApplyIfcMaterialChanges(NewFile):
         self.setup_test()
         ifc_file = tool.Ifc.get()
         element_type = next(ifc_file.by_type("IfcActuatorType").__iter__())
-        red_material = next((i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material"))
+        red_material = next(i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material")
         red_style = tool.Material.get_style(red_material)
-        blue_style = next((i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Blue"))
+        blue_style = next(i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Blue")
 
         ifcopenshell.api.material.assign_material(ifc_file, material=red_material, products=[element_type])
         tool.Material.ensure_material_assigned([element_type], material=red_material)
@@ -576,8 +576,8 @@ class TestApplyIfcMaterialChanges(NewFile):
         self.setup_test()
         ifc_file = tool.Ifc.get()
         element_type = next(ifc_file.by_type("IfcActuatorType").__iter__())
-        red_material = next((i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material"))
-        green_style = next((i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Green"))
+        red_material = next(i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material")
+        green_style = next(i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Green")
 
         # Occurrence with a style.
         element_type_obj = tool.Ifc.get_object(element_type)
@@ -601,9 +601,9 @@ class TestApplyIfcMaterialChanges(NewFile):
     def test_assign_material_to_representation_that_has_2_items_and_1_item_has_a_style(self):
         self.setup_test(and_elements=False)
         ifc_file = tool.Ifc.get()
-        red_material = next((i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material"))
+        red_material = next(i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material")
         red_style = tool.Material.get_style(red_material)
-        green_style = next((i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Green"))
+        green_style = next(i for i in ifc_file.by_type("IfcSurfaceStyle") if i.Name == "Green")
 
         bpy.ops.mesh.primitive_cube_add(size=10, location=(0, 0, 4))
         obj = bpy.data.objects["Cube"]
@@ -664,7 +664,7 @@ class TestApplyIfcMaterialChanges(NewFile):
         self.setup_test(and_elements=True)
         ifc_file = tool.Ifc.get()
         element_type = next(ifc_file.by_type("IfcActuatorType").__iter__())
-        red_material = next((i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material"))
+        red_material = next(i for i in ifc_file.by_type("IfcMaterial") if i.Name == "Red Material")
         no_style_material = ifcopenshell.api.material.add_material(ifc_file, "No Style")
         obj = bpy.data.objects["Simple"]
         element = tool.Ifc.get_entity(obj)