Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-20 12:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RUF015 (next() instead of list comprehensions[0])

Browse Source 
https://docs.astral.sh/ruff/rules/-iterable-allocation-for-first-element/
This commit is contained in:
Andrej730
2025-06-16 12:29:41 +05:00
parent b486b32c8d
commit a12bb343ca
29 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/cad/operator.py
+4 -4
View File
@@ -177,7 +177,7 @@ class CadFillet(bpy.types.Operator):
selected_edges.append(cut_edges[1])
# Calculate the distance to slide each edge to make space for the fillet arc
shared_vert = list(set(selected_edges[0].verts) & set(selected_edges[1].verts))[0]
shared_vert = next(iter(set(selected_edges[0].verts) & set(selected_edges[1].verts)))
v1 = selected_edges[0].other_vert(shared_vert)
v2 = selected_edges[1].other_vert(shared_vert)
dir1 = (v1.co - shared_vert.co).normalized()
@@ -205,7 +205,7 @@ class CadFillet(bpy.types.Operator):
# If faces are involved, then the chamfer edge protects existing faces from the newly created fillet.
# If no faces are involved, we delete the chamfer edge.
if is_wire:
chamfer_edge = [e for e in bm.edges if shared_vert in e.verts and v2 in e.verts][0]
chamfer_edge = next(e for e in bm.edges if shared_vert in e.verts and v2 in e.verts)
bm.edges.remove(chamfer_edge)
bm.verts.index_update()
@@ -675,7 +675,7 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
bm = bmesh.from_edit_mesh(self.mesh)
edges = [e for e in bm.edges if e.select and not e.hide]
mid = list(set(edges[0].verts) & set(edges[1].verts))[0]
mid = next(iter(set(edges[0].verts) & set(edges[1].verts)))
v1 = edges[0].other_vert(mid)
v2 = edges[1].other_vert(mid)
assert v1 and v2
@@ -738,7 +738,7 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
bmesh.ops.remove_doubles(bm, verts=all_verts, dist=1e-4)
# Calculate the distance to slide each edge to make space for the fillet arc
shared_vert = list(set(selected_edges[0].verts) & set(selected_edges[1].verts))[0]
shared_vert = next(iter(set(selected_edges[0].verts) & set(selected_edges[1].verts)))
v1 = selected_edges[0].other_vert(shared_vert)
v2 = selected_edges[1].other_vert(shared_vert)
assert v1 and v2
src/bonsai/bonsai/bim/module/drawing/operator.py
+1 -1
View File
@@ -1062,7 +1062,7 @@ class CreateDrawing(bpy.types.Operator):
# file 2 only has the groups we are interested in.
# in fact in the approach, it's only a single group
g2 = list(yield_groups(svg2))[0]
g2 = next(yield_groups(svg2))
# Loop over the cell paths
for pi, p in enumerate(g2.getElementsByTagName("path")):
src/bonsai/bonsai/bim/module/geometry/operator.py
+5 -5
View File
@@ -1223,12 +1223,12 @@ class DuplicateMoveLinkedAggregate(bpy.types.Operator):
def custom_incremental_naming_for_element_assembly(old_to_new):
for new in old_to_new.values():
if new[0].is_a("IfcElementAssembly"):
group_elements = [
group_elements: list[ifcopenshell.entity_instance] = next(
r.RelatedObjects
for r in getattr(new[0], "HasAssignments", []) or []
if r.is_a("IfcRelAssignsToGroup")
if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
][0]
)
number = len(group_elements) - 1
number = f"{number:02d}"
@@ -1365,12 +1365,12 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
tool.Geometry.delete_ifc_object(tool.Ifc.get_object(element))
def get_original_names(element: ifcopenshell.entity_instance) -> dict[int, dict[int, str]]:
group = [
group = next(
r.RelatingGroup
for r in getattr(element, "HasAssignments", []) or []
if r.is_a("IfcRelAssignsToGroup")
if self.group_name in r.RelatingGroup.Name
][0].id()
).id()
original_names[group] = {}
pset = ifcopenshell.util.element.get_pset(element, self.pset_name)
@@ -1506,7 +1506,7 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
for group in linked_aggregate_groups:
elements = tool.Drawing.get_group_elements(tool.Ifc.get().by_id(group))
if len(linked_aggregate_groups) > 1:
base_instance = [e for e in elements if e in selected_parents][0]
base_instance = next(e for e in elements if e in selected_parents)
instances_to_refresh = elements
elif (len(linked_aggregate_groups) == 1) and (len(selected_parents) > 1):
src/bonsai/bonsai/bim/module/model/profile.py
+3 -3
View File
@@ -102,7 +102,7 @@ class DumbProfileGenerator:
def create_profile(self):
ifc_classes = ifcopenshell.util.type.get_applicable_entities(self.relating_type.is_a(), self.file.schema)
# Standard cases are deprecated, so let's cull them
ifc_class = [c for c in ifc_classes if "StandardCase" not in c][0]
ifc_class = next(c for c in ifc_classes if "StandardCase" not in c)
mesh = bpy.data.meshes.new("Dummy")
obj = bpy.data.objects.new(tool.Model.generate_occurrence_name(self.relating_type, ifc_class), mesh)
@@ -296,9 +296,9 @@ class ExtendProfile(bpy.types.Operator, tool.Ifc.Operator):
if len(selected_objs) == 2:
if self.join_type == "L":
joiner.join_L([o for o in selected_objs if o != context.active_object][0], context.active_object)
joiner.join_L(next(o for o in selected_objs if o != context.active_object), context.active_object)
elif self.join_type == "V":
joiner.join_V([o for o in selected_objs if o != context.active_object][0], context.active_object)
joiner.join_V(next(o for o in selected_objs if o != context.active_object), context.active_object)
if len(selected_objs) < 2:
return {"FINISHED"}
if self.join_type == "T":
src/bonsai/bonsai/bim/module/model/roof.py
+2 -2
View File
@@ -248,9 +248,9 @@ def generate_hipped_roof_bmesh(
for angled_edge, edge_angle in angled_edges:
if angled_edge == verts:
face_angles[edge.link_faces[0]] = edge_angle
ridge_vert = [v for v in face_verts if v.co.copy().freeze() not in verts][0]
ridge_vert = next(v for v in face_verts if v.co.copy().freeze() not in verts)
if len(ridge_vert.link_edges) == 3:
ridge_edge = [e for e in ridge_vert.link_edges if e not in edge.link_faces[0].edges][0]
ridge_edge = next(e for e in ridge_vert.link_edges if e not in edge.link_faces[0].edges)
other_ridge_vert = ridge_edge.other_vert(ridge_vert)
else:
# We cannot actually get this correct without a weighted
src/bonsai/bonsai/bim/module/model/slab.py
+1 -1
View File
@@ -127,7 +127,7 @@ class DumbSlabGenerator:
def create_slab(self):
ifc_classes = ifcopenshell.util.type.get_applicable_entities(self.relating_type.is_a(), self.file.schema)
# Standard cases are deprecated, so let's cull them
ifc_class = [c for c in ifc_classes if "StandardCase" not in c][0]
ifc_class = next(c for c in ifc_classes if "StandardCase" not in c)
mesh = bpy.data.meshes.new("Dummy")
obj = bpy.data.objects.new(tool.Model.generate_occurrence_name(self.relating_type, ifc_class), mesh)
src/bonsai/bonsai/bim/module/model/sverchok_modifier.py
+1 -1
View File
@@ -82,7 +82,7 @@ class CreateNewSverchokGraph(bpy.types.Operator, tool.Ifc.Operator):
sverchok.ui.sv_temporal_viewers.add_temporal_viewer_draw(
node_group.nodes, node_group.links, plane, cut_links=True
)
viewer = [n for n in node_group.nodes if n.bl_idname == "SvViewerDrawMk4"][0]
viewer = next(n for n in node_group.nodes if n.bl_idname == "SvViewerDrawMk4")
viewer.label = f"IFCOutput {viewer.label}"
props.node_group = node_group
src/bonsai/bonsai/bim/module/model/task.py
+2 -2
View File
@@ -22,7 +22,7 @@ import ifcopenshell.api.pset
import ifcopenshell.util.date
def calculate_quantities(usecase_path, ifc_file, settings):
def calculate_quantities(usecase_path, ifc_file: ifcopenshell.file, settings):
if not set(["ScheduleStart", "ScheduleFinish", "ScheduleDuration"]).intersection(
set(settings["attributes"].keys())
):
@@ -30,7 +30,7 @@ def calculate_quantities(usecase_path, ifc_file, settings):
element = settings["task_time"]
if not element.ScheduleDuration:
return
task = [e for e in ifc_file.get_inverse(element) if e.is_a("IfcTask")][0]
task = next(e for e in ifc_file.get_inverse(element) if e.is_a("IfcTask"))
qto = ifcopenshell.api.pset.add_qto(
ifc_file, should_run_listeners=False, product=task, name="Qto_TaskBaseQuantities"
)
src/bonsai/bonsai/bim/module/model/wall.py
+2 -2
View File
@@ -1032,9 +1032,9 @@ class DumbWallGenerator:
tool.Blender.select_object(obj)
return obj
def get_relating_type_class(self, relating_type):
def get_relating_type_class(self, relating_type: ifcopenshell.entity_instance) -> str:
classes = ifcopenshell.util.type.get_applicable_entities(relating_type.is_a(), tool.Ifc.get().schema)
return [c for c in classes if "StandardCase" not in c][0]
return next(c for c in classes if "StandardCase" not in c)
class DumbWallPlaner:
src/bonsai/bonsai/bim/module/patch/operator.py
+1 -1
View File
@@ -140,7 +140,7 @@ class UpdateIfcPatchArguments(bpy.types.Operator):
if "file" in data_type or is_filepath_argument:
data_type = ["file"]
data_type = [dt for dt in data_type if dt != "NoneType"][0]
data_type = next(dt for dt in data_type if dt != "NoneType")
data_types: dict[str, AttributeDataType] = {
"Literal": "enum",
src/bonsai/bonsai/bim/module/project/operator.py
+1 -1
View File
@@ -320,7 +320,7 @@ class ChangeLibraryElement(bpy.types.Operator):
for element in elements:
ifc_classes_elements[element.is_a()].append(element)
if len(ifc_classes_elements) == 1 and list(ifc_classes_elements)[0] == self.element_name:
if len(ifc_classes_elements) == 1 and next(iter(ifc_classes_elements)) == self.element_name:
for name, ifc_definition_id in sorted(
[(self.get_name(e), e.id()) for e in ifc_classes_elements[self.element_name]]
):
src/bonsai/bonsai/bim/module/resource/ui.py
+2 -1
View File
@@ -250,7 +250,8 @@ class BIM_PT_resources(Panel):
if resource["BaseQuantity"]:
quantity = resource["BaseQuantity"]
value = quantity[[k for k in quantity.keys() if "Value" in k][0]]
key = next(k for k in quantity.keys() if "Value" in k)
value = quantity[key]
row = self.layout.row(align=True)
row.label(text=quantity["Name"])
row.label(text="{0:.2f}".format(value))
src/bonsai/bonsai/bim/module/structural/operator.py
+2 -2
View File
@@ -199,7 +199,7 @@ class EnableEditingStructuralBoundaryCondition(bpy.types.Operator):
elif isinstance(value, float):
new.float_value = 0.0 if new.is_null else value
new.data_type = "float"
new.enum_value = [i for i in enum_items if i != "IfcBoolean"][0]
new.enum_value = next(i for i in enum_items if i != "IfcBoolean")
elif data_type == "string":
new.string_value = "" if new.is_null else value
new.data_type = "string"
@@ -975,7 +975,7 @@ class EnableEditingBoundaryCondition(bpy.types.Operator):
elif isinstance(value, float):
new.float_value = 0.0 if new.is_null else value
new.data_type = "float"
new.enum_value = [i for i in enum_items if i != "IfcBoolean"][0]
new.enum_value = next(i for i in enum_items if i != "IfcBoolean")
elif data_type == "string":
new.string_value = "" if new.is_null else value
new.data_type = "string"
src/bonsai/test/tool/test_brick.py
+3 -3
View File
@@ -177,9 +177,9 @@ class TestRemoveRelation(NewFile):
def test_run(self):
TestAddRelation().test_run()
assert BrickStore.graph
source, relation, destination = list(
BrickStore.graph.triples((None, URIRef("https://brickschema.org/schema/Brick#feeds"), None))
)[0]
source, relation, destination = next(
iter(BrickStore.graph.triples((None, URIRef("https://brickschema.org/schema/Brick#feeds"), None)))
)
subject.remove_relation(source, relation, destination)
assert not list(
BrickStore.graph.triples(
src/bonsai/test/tool/test_classification.py
+2 -2
View File
@@ -55,7 +55,7 @@ class TestAddClassificationReferenceFromBSDD(NewFile):
bpy.ops.bim.add_classification_reference_from_bsdd(obj="IfcSpace/Cube", obj_type="Object")
refs = ifcopenshell.util.classification.get_references(element)
assert len(refs) == 1
assert list(refs)[0].Location.startswith(uri)
assert next(iter(refs)).Location.startswith(uri)
def test_add_classification_refence_with_props(self):
bpy.ops.bim.create_project()
@@ -92,7 +92,7 @@ class TestAddClassificationReferenceFromBSDD(NewFile):
assert pset and pset["Handicap Accessible"] == True
refs = ifcopenshell.util.classification.get_references(element)
assert len(refs) == 1
assert list(refs)[0].Location.startswith(uri)
assert next(iter(refs)).Location.startswith(uri)
def test_add_clasification_reference_with_object_type(self):
bpy.ops.bim.create_project()
src/bonsai/test/tool/test_model.py
+1 -1
View File
@@ -106,7 +106,7 @@ class TestGetManualBooleans(NewFile):
assert set(subject.get_booleans(element, representation)) == set(bools)
assert len(subject.get_manual_booleans(element, representation)) == 0
bool1 = list(bools)[0]
bool1 = bools[0]
subject.mark_manual_booleans(element, [bool1])
assert set(subject.get_manual_booleans(element, representation)) == {bool1}