Ooops, fix black formatter ignoring bonsai folder #5178

pyproject.toml

@@ -4,7 +4,7 @@ include = '''
     src/(
         bcf
         |bcfserver
-        |blenderbim
+        |bonsai
         |bsdd
         |foundationserver
         |ifc2ca

src/bonsai/bonsai/bim/module/cost/ui.py

@@ -73,8 +73,12 @@ class BIM_PT_cost_schedules(Panel):
             row1.label(text="Schedule tools")
             row1 = col.row(align=True)
             row1.alignment = "RIGHT"
-            row1.operator("bim.export_cost_schedules", text="Export spreadsheet", icon="EXPORT").cost_schedule = cost_schedule["id"]
+            row1.operator("bim.export_cost_schedules", text="Export spreadsheet", icon="EXPORT").cost_schedule = (
-            row1.operator("bim.generate_cost_schedule_browser", text="Generate spreadsheet browsser", icon="URL").cost_schedule = cost_schedule["id"]
+                cost_schedule["id"]
+            )
+            row1.operator(
+                "bim.generate_cost_schedule_browser", text="Generate spreadsheet browsser", icon="URL"
+            ).cost_schedule = cost_schedule["id"]
             row2 = col.row(align=True)
             row2.alignment = "RIGHT"
             op = row2.operator("bim.select_cost_schedule_products", icon="RESTRICT_SELECT_OFF", text="Assigned")

src/bonsai/bonsai/bim/module/model/__init__.py

@@ -218,6 +218,7 @@ def register():
 
     workspace.load_custom_icons()
 
+
 def unregister():
     if not bpy.app.background:
         bpy.utils.unregister_tool(workspace.WallTool)

src/bonsai/bonsai/bim/module/model/decorator.py

@@ -413,7 +413,9 @@ class PolylineDecorator:
 
         distance = (snap_vector - last_point).length
         if distance > 0:
-            angle = tool.Cad.angle_3_vectors(second_to_last_point, last_point, snap_vector, new_angle=None, degrees=True)
+            angle = tool.Cad.angle_3_vectors(
+                second_to_last_point, last_point, snap_vector, new_angle=None, degrees=True
+            )
 
             # Round angle to the nearest 0.05
             angle = round(angle / 0.05) * 0.05
@@ -547,12 +549,17 @@ class PolylineDecorator:
             if context.scene.unit_settings.length_unit == "MILLIMETERS":
                 factor = 1000
 
-        return format_distance(
+        return format_distance(value * factor, precision=precision, suppress_zero_inches=True, in_unit_length=True)
-                    value * factor, precision=precision, suppress_zero_inches=True, in_unit_length=True
-                )
 
     def draw_input_panel(self, context):
-        texts = {"D": "Distance: ", "A": "Angle: ", "X": "X coord: ", "Y": "Y coord: ", "Z": "Z coord:", "AREA": "Area: "}
+        texts = {
+            "D": "Distance: ",
+            "A": "Angle: ",
+            "X": "X coord: ",
+            "Y": "Y coord: ",
+            "Z": "Z coord:",
+            "AREA": "Area: ",
+        }
 
         self.addon_prefs = tool.Blender.get_addon_preferences()
         self.font_id = 0
@@ -687,7 +694,6 @@ class PolylineDecorator:
         for i in range(len(polyline_points) - 1):
             polyline_edges.append([i, i + 1])
 
-
         # Line for angle axis snap
         if snap_prop.snap_type == "Axis":
             self.line_shader.uniform_float("lineWidth", 0.75)
@@ -728,4 +734,3 @@ class PolylineDecorator:
         self.draw_batch("POINTS", polyline_points, decorator_color_selected)
         if len(polyline_points) > 1:
             self.draw_batch("LINES", polyline_points, decorator_color_selected, polyline_edges)
-

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

@@ -111,11 +111,13 @@ class PolylinePoint(PropertyGroup):
     y: bpy.props.FloatProperty(name="Y")
     z: bpy.props.FloatProperty(name="Z")
 
+
 class PolylineMeasurement(PropertyGroup):
     dim: bpy.props.StringProperty(name="Dimension")
     angle: bpy.props.StringProperty(name="Angle")
     position: bpy.props.FloatVectorProperty(name="Decorator Position", size=3)
 
+
 class BIMModelProperties(PropertyGroup):
     ifc_class: bpy.props.EnumProperty(items=get_ifc_class, name="Construction Class", update=update_ifc_class)
     relating_type_id: bpy.props.EnumProperty(

src/bonsai/bonsai/bim/module/model/workspace.py

@@ -33,7 +33,7 @@ from bonsai.bim.module.model.prop import get_ifc_class
 def check_display_mode():
     global display_mode
     try:
-        theme = bpy.context.preferences.themes['Default']
+        theme = bpy.context.preferences.themes["Default"]
         text_color = theme.user_interface.wcol_menu_item.text
         background_color = theme.user_interface.wcol_menu_item.outline
         print(f"text_color = {text_color}")
@@ -1181,6 +1181,7 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
         else:
             bpy.ops.bim.show_openings()
 
+
 custom_icon_previews = None
 display_mode = None
 

src/bonsai/bonsai/bim/module/search/ui.py

@@ -102,7 +102,6 @@ class BIM_PT_colour_by_property(Panel):
             if props.max_mode == "MANUAL":
                 row.prop(props, "max_value", text="")
 
-
         row = self.layout.row(align=True)
         row.operator("bim.colour_by_property", icon="BRUSH_DATA")
         row.operator("bim.reset_object_colours")

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

@@ -87,9 +87,7 @@ class AssignContainer(bpy.types.Operator, tool.Ifc.Operator):
         elif (container_obj := props.container_obj) and (container := tool.Ifc.get_entity(container_obj)):
             pass
         for element_obj in context.selected_objects:
-            core.assign_container(
+            core.assign_container(tool.Ifc, tool.Collector, tool.Spatial, container=container, element_obj=element_obj)
-                tool.Ifc, tool.Collector, tool.Spatial, container=container, element_obj=element_obj
-            )
 
 
 class EnableEditingContainer(bpy.types.Operator, tool.Ifc.Operator):

src/bonsai/bonsai/tool/cad.py

@@ -102,10 +102,13 @@ class Cad:
         # Calculate the unsigned angle between the "d1" and "d2" vectors
         a = d1.angle(d2)
 
-
         # Determine the sign of the angle based on the provided axis
         # If new_angle, determine the direction of the rotation
-        parameter = round(axis.z, 2) < 0 or (round(axis.y, 2) == 0 and round(axis.x < 0)) or (round(axis.x, 2) == 0 and round(axis.y < 0))
+        parameter = (
+            round(axis.z, 2) < 0
+            or (round(axis.y, 2) == 0 and round(axis.x < 0))
+            or (round(axis.x, 2) == 0 and round(axis.y < 0))
+        )
         if new_angle is not None:
             rot_mat = Matrix.Rotation(new_angle, 3, axis)
             rot_vector = (d1 @ rot_mat) if parameter else (rot_mat @ d1)

src/bonsai/bonsai/tool/cost.py

@@ -811,6 +811,7 @@ class Cost(bonsai.core.tool.Cost):
     @classmethod
     def create_cost_schedule_json(cls, cost_schedule: ifcopenshell.entity_instance) -> dict:
         from bonsai.bim.module.cost.data import CostSchedulesData
+
         CostSchedulesData.load()
         cost_items = CostSchedulesData.data["cost_items"]
         data = []
@@ -832,7 +833,7 @@ class Cost(bonsai.core.tool.Cost):
             return None
         for rel in cost_item.IsNestedBy or []:
             for sub_cost_item in rel.RelatedObjects or []:
-                cls.create_cost_item_json(sub_cost_item, cost_items,cost_item_data["is_nested_by"])
+                cls.create_cost_item_json(sub_cost_item, cost_items, cost_item_data["is_nested_by"])
 
     @classmethod
     def is_cost_item_sum(cls, cost_item: ifcopenshell.entity_instance) -> bool:

src/bonsai/bonsai/tool/raycast.py

@@ -193,7 +193,9 @@ class Raycast(bonsai.core.tool.Raycast):
             loc = Vector((0, 0, 0))
 
         polyline_data = bpy.context.scene.BIMModelProperties.polyline_point
-        polyline_data = polyline_data[: len(polyline_data) - 1] # It doesn't make sense to snap to the last point created
+        polyline_data = polyline_data[
+            : len(polyline_data) - 1
+        ]  # It doesn't make sense to snap to the last point created
         polyline_points = []
         for point_data in polyline_data:
             point = Vector((point_data.x, point_data.y, point_data.z))

src/bonsai/bonsai/tool/snap.py

@@ -70,7 +70,6 @@ class Snap(bonsai.core.tool.Snap):
 
         return snap_point
 
-
     @classmethod
     def select_snap_point(cls, snap_points, hit, threshold):
         shortest_distance = None
@@ -168,7 +167,7 @@ class Snap(bonsai.core.tool.Snap):
         if len(polyline_data) > 2:
             first_point = polyline_data[0]
             last_point = polyline_data[-1]
-            if not(first_point.x == last_point.x and first_point.y == last_point.y and first_point.z == last_point.z):
+            if not (first_point.x == last_point.x and first_point.y == last_point.y and first_point.z == last_point.z):
                 polyline_point = bpy.context.scene.BIMModelProperties.polyline_point.add()
                 polyline_point.x = first_point.x
                 polyline_point.y = first_point.y
@@ -361,7 +360,6 @@ class Snap(bonsai.core.tool.Snap):
                         best_hit = hit_world
                         best_face_index = face_index
 
-
             if best_obj is not None:
                 return best_obj, best_hit, best_face_index
 

src/bonsai/bonsai/tool/web.py

@@ -333,7 +333,6 @@ class Web(bonsai.core.tool.Web):
             bpy.context.view_layer.objects.active = obj
             obj.select_set(True)
 
-
     @classmethod
     def handle_cost_operator(cls, operator_data: dict) -> None:
         """
@@ -348,10 +347,11 @@ class Web(bonsai.core.tool.Web):
             cost_schedules = ifc_file.by_type("IfcCostSchedule")
             cost_schedules_json = [cs.get_info(recursive=True) for cs in cost_schedules]
             currency = tool.Cost.currency()
-            cls.send_webui_data(data={
+            cls.send_webui_data(
-                "cost_schedules": cost_schedules_json,
+                data={"cost_schedules": cost_schedules_json, "currency": currency},
-                "currency": currency
+                data_key="cost_schedules",
-            }, data_key="cost_schedules", event="cost_schedules")
+                event="cost_schedules",
+            )
         if operator_data["type"] == "loadCostSchedule":
             cost_schedule = ifc_file.by_id(operator_data["costScheduleId"])
             bonsai.core.cost.enable_editing_cost_items(tool.Cost, cost_schedule=cost_schedule)
@@ -375,36 +375,28 @@ class Web(bonsai.core.tool.Web):
             cls.load_cost_schedule_web_ui(cost_schedule)
         if operator_data["type"] == "editCostItemName":
             cost_item = tool.Ifc.get().by_id(operator_data["costItemId"])
-            tool.Ifc.run(
+            tool.Ifc.run("cost.edit_cost_item", cost_item=cost_item, attributes={"Name": operator_data["name"]})
-                "cost.edit_cost_item",
-                cost_item=cost_item,
-                attributes = {"Name": operator_data["name"]}
-            )
             tool.Cost.load_cost_schedule_tree()
         if operator_data["type"] == "enableEditingCostValues":
             cost_item = tool.Ifc.get().by_id(operator_data["costItemId"])
             cost_values = ifcopenshell.util.cost.get_cost_values(cost_item)
-            cls.send_webui_data(data={
+            cls.send_webui_data(
-                "cost_values": cost_values,
+                data={"cost_values": cost_values, "cost_item_id": operator_data["costItemId"]},
-                "cost_item_id": operator_data["costItemId"]
+                data_key="cost_values",
-            }, data_key="cost_values", event="cost_values")
+                event="cost_values",
+            )
         if operator_data["type"] == "addCostValue":
             value = ifcopenshell.api.cost.add_cost_value(
                 ifc_file,
                 parent=ifc_file.by_id(operator_data["costItemId"]),
             )
             cls.send_webui_data(
-                data={
+                data={"cost_value_id": value.id(), "cost_item_id": operator_data["costItemId"]},
-                "cost_value_id" : value.id(), 
-                "cost_item_id":operator_data["costItemId"]}, 
                 data_key="cost_value",
-                event="cost_value"
+                event="cost_value",
             )
         if operator_data["type"] == "deleteCostValue":
-            bpy.ops.bim.remove_cost_value(
+            bpy.ops.bim.remove_cost_value(parent=operator_data["costItemId"], cost_value=operator_data["costValueId"])
-                parent=operator_data["costItemId"],
-                cost_value=operator_data["costValueId"]
-                )
             cost_item = ifc_file.by_id(operator_data["costItemId"])
             cost_schedule = tool.Cost.get_cost_schedule(cost_item=cost_item)
             cls.load_cost_schedule_web_ui(cost_schedule)
@@ -416,29 +408,19 @@ class Web(bonsai.core.tool.Web):
                 print("editing cost value data", value_data)
                 value = ifc_file.by_id(value_data["id"])
                 if value_data["costType"] == "FIXED":
-                    attributes= {
+                    attributes = {"AppliedValue": value_data["appliedValue"], "Category": None}
-                        "AppliedValue": value_data["appliedValue"],
-                        "Category": None
-                    }
                 elif value_data["costType"] == "CATEGORY":
-                    attributes= {
+                    attributes = {
                         "AppliedValue": value_data["appliedValue"],
                         "Category": value_data["costCategory"],
                     }
                 elif value_data["costType"] == "SUM":
-                    attributes= {
+                    attributes = {"Category": "*"}
-                        "Category": '*'
+                ifcopenshell.api.cost.edit_cost_value(file=ifc_file, cost_value=value, attributes=attributes)
-                    }
-                ifcopenshell.api.cost.edit_cost_value(
-                    file=ifc_file,
-                    cost_value=value,
-                    attributes= attributes
-                )
                 print(value.get_info())
             tool.Cost.load_cost_schedule_tree()
             cls.load_cost_schedule_web_ui(cost_schedule)
 
-
     @classmethod
     def load_cost_schedule_web_ui(cls, cost_schedule):
         json_data = tool.Cost.create_cost_schedule_json(cost_schedule)

src/bonsai/scripts/generate_png_icons.py

@@ -10,98 +10,106 @@ import xml.etree.ElementTree as ET
 import re
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-SVG_FILE = os.path.join(SCRIPT_DIR, 'bonsai_icons.svg')
+SVG_FILE = os.path.join(SCRIPT_DIR, "bonsai_icons.svg")
-EXPORT_FOLDER = os.path.join(SCRIPT_DIR, '..', 'bonsai', 'bim', 'data', 'icons')
+EXPORT_FOLDER = os.path.join(SCRIPT_DIR, "..", "bonsai", "bim", "data", "icons")
 
 overwrite_all = False
 skip_all = False
 
+
 def dark_to_light(svg_content):
-    svg_content = re.sub(r'#ffffff', '#434343', svg_content, flags=re.IGNORECASE)   # white to drak grey
+    svg_content = re.sub(r"#ffffff", "#434343", svg_content, flags=re.IGNORECASE)  # white to drak grey
 
-    svg_content = re.sub(r'#00d27b', '#009d5c', svg_content, flags=re.IGNORECASE)   # make green darker
+    svg_content = re.sub(r"#00d27b", "#009d5c", svg_content, flags=re.IGNORECASE)  # make green darker
-    svg_content = re.sub(r'#009a5f', '#00663f', svg_content, flags=re.IGNORECASE)   # make dark green darker
+    svg_content = re.sub(r"#009a5f", "#00663f", svg_content, flags=re.IGNORECASE)  # make dark green darker
-    svg_content = re.sub(r'#75ffaf', '#3dff8f', svg_content, flags=re.IGNORECASE)   # make light green darker
+    svg_content = re.sub(r"#75ffaf", "#3dff8f", svg_content, flags=re.IGNORECASE)  # make light green darker
 
-    svg_content = re.sub(r'#cce3ff', '#3391ff', svg_content, flags=re.IGNORECASE)   # make blue darker
+    svg_content = re.sub(r"#cce3ff", "#3391ff", svg_content, flags=re.IGNORECASE)  # make blue darker
-    svg_content = re.sub(r'#4c9fff', '#005fcc', svg_content, flags=re.IGNORECASE)   # make dark blue darker
+    svg_content = re.sub(r"#4c9fff", "#005fcc", svg_content, flags=re.IGNORECASE)  # make dark blue darker
-    svg_content = re.sub(r'#c9e0ff', '#80b8ff', svg_content, flags=re.IGNORECASE)   # make light blue darker
+    svg_content = re.sub(r"#c9e0ff", "#80b8ff", svg_content, flags=re.IGNORECASE)  # make light blue darker
 
     return svg_content
 
+
 def prompt_overwrite(file_path, png_name):
     global overwrite_all, skip_all
 
     if skip_all and os.path.exists(file_path):
-        return 'n'
+        return "n"
 
     if overwrite_all:
-        return 'y'
+        return "y"
 
     if os.path.exists(file_path):
         while True:
-            response = input(f"File '{png_name}' already exists.\nOverwrite? (Enter = yes, s = skip, y = yes all, n = no all): ").strip().lower()
+            response = (
-            if response in {'', 'y', 'n', 's'}:
+                input(
-                if response == 'y':
+                    f"File '{png_name}' already exists.\nOverwrite? (Enter = yes, s = skip, y = yes all, n = no all): "
+                )
+                .strip()
+                .lower()
+            )
+            if response in {"", "y", "n", "s"}:
+                if response == "y":
                     overwrite_all = True
-                elif response == 'n':
+                elif response == "n":
                     skip_all = True
                 return response
             else:
                 print("Invalid option. Please enter Enter, y, n, or s.")
-    return ''
+    return ""
+
 
 def export_svg_group(group_content, group_label, mode, output_folder):
-    temp_svg_file = os.path.join(output_folder, f'{group_label}_{mode}.svg')
+    temp_svg_file = os.path.join(output_folder, f"{group_label}_{mode}.svg")
     svg_content = f"""<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
     width="31.999998" height="31.999998" viewBox="0 0 8.4666661 8.4666661">
     {group_content}
     </svg>"""
 
-    with open(temp_svg_file, 'w') as file:
+    with open(temp_svg_file, "w") as file:
         file.write(svg_content)
 
-    png_name = f'{mode}_{group_label}.png'
+    png_name = f"{mode}_{group_label}.png"
     output_png_file = os.path.join(output_folder, png_name)
 
     user_choice = prompt_overwrite(output_png_file, png_name)
 
-    if user_choice in {'y', ''}:
+    if user_choice in {"y", ""}:
-        subprocess.run(['inkscape', temp_svg_file, '--export-type=png', '--export-filename=' + output_png_file])
+        subprocess.run(["inkscape", temp_svg_file, "--export-type=png", "--export-filename=" + output_png_file])
-        print(f'\033[32mExported PNG file: {output_png_file}\033[0m')
+        print(f"\033[32mExported PNG file: {output_png_file}\033[0m")
 
-    
+    elif user_choice == "n":
-    elif user_choice == 'n':
         print(f"Skipping {png_name}")
 
-    elif user_choice == 's':
+    elif user_choice == "s":
-        print(f'Skipped exporting {output_png_file}.')
+        print(f"Skipped exporting {output_png_file}.")
 
     os.remove(temp_svg_file)
 
 
-
 def export_svg_groups_to_png(svg_file, output_folder):
     tree = ET.parse(svg_file)
     root = tree.getroot()
-    ns = {'svg': 'http://www.w3.org/2000/svg'}
+    ns = {"svg": "http://www.w3.org/2000/svg"}
 
-    for group in root.findall('.//svg:g', ns):
+    for group in root.findall(".//svg:g", ns):
-        group_label = group.get('{http://www.inkscape.org/namespaces/inkscape}label')
+        group_label = group.get("{http://www.inkscape.org/namespaces/inkscape}label")
         if not group_label:
             continue
 
-        style = group.get('style', '')
+        style = group.get("style", "")
-        if 'display:none' in style:
+        if "display:none" in style:
-            style = style.replace('display:none', 'display:inline')
+            style = style.replace("display:none", "display:inline")
-        elif 'display' not in style:
+        elif "display" not in style:
-            style += ';display:inline'
+            style += ";display:inline"
-        group.set('style', style)
+        group.set("style", style)
 
-        group_content = ET.tostring(group, encoding='unicode', method='xml')
+        group_content = ET.tostring(group, encoding="unicode", method="xml")
-        export_svg_group(group_content, group_label, 'dm', output_folder)
+        export_svg_group(group_content, group_label, "dm", output_folder)
         light_mode_svg = dark_to_light(group_content)
-        export_svg_group(light_mode_svg, group_label, 'lm', output_folder)
+        export_svg_group(light_mode_svg, group_label, "lm", output_folder)
+
 
 if __name__ == "__main__":
     os.makedirs(EXPORT_FOLDER, exist_ok=True)