Fix #7275: Make remove_drawing_from_sheet undoable

Blender's undo restores IFC state but not files on disk.
remove_drawing_from_sheet no longer modifies the layout SVG.
build_drawings() handles stale groups (reference removed from
IFC) by skipping them in the output tree only. next_drawing_
location() filters stale groups when placing new drawings.

Generated with the assistance of an AI coding tool.

.github/workflows/build_osx.yml

@@ -53,7 +53,7 @@ jobs:
           python ../nix/cache_dependencies.py unpack
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: mac-${{ matrix.arch }}
 

.github/workflows/build_pyodide.yml

@@ -29,7 +29,7 @@ jobs:
           python ../IfcOpenShell/nix/cache_dependencies.py unpack
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 

.github/workflows/build_rocky.yml

@@ -48,7 +48,7 @@ jobs:
           python3 ../nix/cache_dependencies.py unpack
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
 

.github/workflows/build_rocky_arm.yml

@@ -48,7 +48,7 @@ jobs:
           python3 ../nix/cache_dependencies.py unpack
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: ubuntu-22.04-${{ runner.arch }}-rockylinux9
 

.github/workflows/build_win.yml

@@ -52,7 +52,7 @@ jobs:
           }
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: win-${{ matrix.arch }}
           # Windows ccache needs ~1GB

.github/workflows/ci-black-formatting.yaml

@@ -7,9 +7,6 @@ on:
 jobs:
   lint-formatting:
     runs-on: ubuntu-latest
-    env:
-      MIN_IOS_PY_VERSION: "3.10"
-      MIN_BLENDER_PY_VERSION: "3.11"
     steps:
       - name: Action - checkout repository
         uses: actions/checkout@v6
@@ -17,12 +14,12 @@ jobs:
       - name: Action - install python
         uses: actions/setup-python@v6
         with:
-          python-version: ${{ env.MIN_IOS_PY_VERSION }}
+          python-version: "3.10"
 
       - name: Action - install python
         uses: actions/setup-python@v6
         with:
-          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -38,8 +35,8 @@ jobs:
           ERROR=0
           # Using 2 Python versions - one minimum required for IfcOpenShell
           # and other that's used by Blender currently.
-          python${{ env.MIN_IOS_PY_VERSION }} -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python${{ env.MIN_BLENDER_PY_VERSION }} -W error -m compileall -q src/bonsai || ERROR=1
+          python3.10 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
           exit $ERROR
         continue-on-error: true
 

.github/workflows/ci-ifcopenshell-docker.yml

@@ -35,7 +35,7 @@ jobs:
 
     -
       name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.21
+      uses: hendrikmuhs/ccache-action@v1.2.20
 
     - 
       name: Build ifcopenshell

.github/workflows/ci-ifcopenshell-python-pypi.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",

.github/workflows/ci-ifcopenshell-python.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
         config:
           - {
             name: "Windows 64bit",

.github/workflows/ci.yml

@@ -79,7 +79,7 @@ jobs:
           libhdf5-dev libcgal-dev libeigen3-dev
           
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.21
+        uses: hendrikmuhs/ccache-action@v1.2.20
         with:
           key: ubuntu-22.04-${{ runner.arch }}
 
@@ -254,7 +254,6 @@ jobs:
           cd ../ifcpatch && make test || ERROR=1
           pip install -e ../ifctester --no-deps
           cd ../ifctester && make test || ERROR=1
-          make build-ids-docs || ERROR=1
           # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
           cd ../ifcopenshell-python
           pip install mathutils

.gitignore

@@ -5,8 +5,6 @@
 /_installed-vs*-x*/
 /build/
 /src/examples/build/
-# ifctester docs output
-/src/ifctester/test/build/
 
 # output directories
 /cmake/out/
@@ -14,7 +12,6 @@
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/
-/src/ifctester/webapp/public/pyodide/
 
 /win/BuildDepsCache*.txt
 
@@ -83,14 +80,10 @@ src/ifcopenshell-python/test/build
 # bonsai i18n
 src/bonsai/bonsai/translations.py
 
-# bonsai external dependencies (cloned for just ty checks)
-src/bonsai/external_dependencies/
-
-# bonsai test temp/cache files
+# bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/*.cache.blend
-src/bonsai/test/files/*.cache.json
-src/bonsai/test/files/*.cache.sqlite
+src/bonsai/test/files/basic.ifc.cache.blend
+src/bonsai/test/files/basic.ifc.cache.sqlite
 
 # bonsai data
 src/bonsai/bonsai/bim/data/build/

choco/bonsai/choco_release.py

@@ -13,7 +13,6 @@ import hashlib
 import os
 import pathlib
 import re
-import subprocess
 from typing import NoReturn
 from urllib import request
 
@@ -21,7 +20,7 @@ from github import Github
 
 
 def get_repo_tag_names() -> list[str]:
-    git_return = subprocess.check_output("git tag -l", text=True)
+    git_return = os.popen("git tag -l").read()
     tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
     print(f"{len(tag_names)} tag_names found in repo")
     return tag_names
@@ -79,10 +78,6 @@ def get_release_zip(tag: str) -> tuple[str, str]:
     raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
 
 
-def run(command: str) -> None:
-    subprocess.check_output(command)
-
-
 start = datetime.datetime.now()
 
 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
@@ -102,7 +97,7 @@ should_release = False
 target_release_tag = ""
 TARGET_OS = "windows-x64"
 
-git_status = subprocess.check_output("git status", text=True)
+git_status = os.popen("git status").read()
 print(git_status)
 
 for tag_name in get_repo_tag_names():
@@ -152,7 +147,7 @@ blenderbim_build_version = target_release_tag.replace("blenderbim-", "")
 
 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-subprocess.check_call(f"wget {url_blenderbim_py3x_win_zip} --no-verbose")
+os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
 
 # sha256sum_blenderbim_py310_win_zip
 sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
@@ -206,13 +201,13 @@ print("[INFO] inserting dynamic chocolatey package parameters successful")
 print("\n_____ build choco.exe with mono")
 
 choco_version = "1.1.0"
-run(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet")
-run(f"tar -xzf {choco_version}.tar.gz")
+os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
+os.popen(f"tar -xzf {choco_version}.tar.gz").read()
 print("choco tar unpack successful")
 os.chdir("choco-1.1.0")
-run("./build.sh")
+os.popen("./build.sh").read()
 
-run("cp -r build_output/chocolatey /opt/chocolatey")
+os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
 os.chdir(BLENDERBIM_DIR)
 
 if pathlib.Path("/opt/chocolatey/choco.exe").exists():
@@ -220,15 +215,11 @@ if pathlib.Path("/opt/chocolatey/choco.exe").exists():
 
 print("\n_____ build choco pack")
 
-run("mono /opt/chocolatey/choco.exe pack --allow-unofficial")
-run(
-    'mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial'
-)
+os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
+os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()
 
 print("\n_____ build choco push")
-run(
-    'mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose'
-)
+os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()
 
 print(f"choco push of version: {target_release_tag} successful!")
 print(f"it took: {datetime.datetime.now() - start}")

nix/cache_dependencies.py

@@ -41,9 +41,6 @@ def pack_dependencies(install_dir: Path) -> None:
         if not dependency_path.is_dir():
             continue
         dependency_name = dependency_path.name
-        # Skip ifcopenshell - it's a build output, not a dependency to reuse across builds.
-        if dependency_name == "ifcopenshell":
-            continue
         tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
         if tar_path.exists():
             print(f"Skipping existing cache: '{tar_path}'")

pyproject.toml

@@ -3,7 +3,7 @@ name = "IfcOpenShell"
 version = "0.0.0"
 dependencies = [
     "black==26.3.1",
-    "ruff==0.15.7",
+    "ruff==0.15.6",
     "poethepoet",
     "gersemi==0.26.1",
 ]
@@ -78,139 +78,6 @@ ignore = [
     "UP032", # Replace .format with f-string
 ]
 
-[tool.ty.rules]
-all = "ignore"
-
-# Structural rules (no deep type inference needed, easier to adapt).
-abstract-method-in-final-class = "error"
-ambiguous-protocol-member = "error"
-byte-string-type-annotation = "error"
-conflicting-declarations = "error"
-conflicting-metaclass = "error"
-cyclic-class-definition = "error"
-cyclic-type-alias-definition = "error"
-dataclass-field-order = "error"
-duplicate-base = "error"
-duplicate-kw-only = "error"
-empty-body = "error"
-escape-character-in-forward-annotation = "error"
-final-on-non-method = "error"
-final-without-value = "error"
-fstring-type-annotation = "error"
-ignore-comment-unknown-rule = "error"
-implicit-concatenated-string-type-annotation = "error"
-inconsistent-mro = "error"
-ineffective-final = "error"
-instance-layout-conflict = "error"
-invalid-dataclass = "error"
-invalid-dataclass-override = "error"
-invalid-enum-member-annotation = "error"
-invalid-explicit-override = "error"
-invalid-frozen-dataclass-subclass = "error"
-invalid-generic-class = "error"
-invalid-generic-enum = "error"
-invalid-ignore-comment = "error"
-invalid-legacy-positional-parameter = "error"
-invalid-legacy-type-variable = "error"
-invalid-named-tuple = "error"
-invalid-newtype = "error"
-invalid-overload = "error"
-invalid-paramspec = "error"
-invalid-protocol = "error"
-invalid-syntax-in-forward-annotation = "error"
-invalid-total-ordering = "error"
-invalid-type-alias-type = "error"
-invalid-type-checking-constant = "error"
-invalid-type-guard-definition = "error"
-invalid-type-variable-bound = "error"
-invalid-type-variable-constraints = "error"
-invalid-typed-dict-header = "error"
-invalid-typed-dict-statement = "error"
-override-of-final-method = "error"
-override-of-final-variable = "error"
-possibly-missing-import = "error"
-possibly-missing-submodule = "error"
-# Has false positives due to ty walrus operator bug.
-# possibly-unresolved-reference = "error"
-raw-string-type-annotation = "error"
-redundant-final-classvar = "error"
-shadowed-type-variable = "error"
-subclass-of-final-class = "error"
-super-call-in-named-tuple-method = "error"
-unavailable-implicit-super-arguments = "error"
-unbound-type-variable = "error"
-undefined-reveal = "error"
-unresolved-global = "error"
-unresolved-import = "error"
-unresolved-reference = "error"
-unused-ignore-comment = "error"
-unused-type-ignore-comment = "error"
-useless-overload-body = "error"
-
-# Non-structural rules:
-deprecated = "error"
-zero-stepsize-in-slice = "error"
-possibly-missing-implicit-call = "error"
-unused-awaitable = "error"
-
-# Function argument rules:
-# Conflicts with `ifcopenshell.api.geometry.add_representation` type of callables we have, confusing them with a module.
-# call-non-callable = "error"
-conflicting-argument-forms = "error"
-# Too many false positives.
-# invalid-argument-type = "error"
-missing-argument = "error"
-parameter-already-assigned = "error"
-positional-only-parameter-as-kwarg = "error"
-too-many-positional-arguments = "error"
-unknown-argument = "error"
-# Has a lot of warnings due to current ty walrus operator issues.
-# index-out-of-bounds = "error"
-# unresolved-attribute = "error"
-
-[tool.ty.environment]
-extra-paths = [
-    "src/bonsai/external_dependencies",
-    "src/bcf",
-    "src/bsdd",
-    "src/bonsai",
-    "src/ifc4d",
-    "src/ifc5d",
-    "src/ifccityjson",
-    "src/ifcclash",
-    "src/ifccsv",
-    "src/ifcdiff",
-    "src/ifcfm",
-    "src/ifcopenshell-python",
-    "src/ifcpatch",
-    "src/ifctester",
-]
-
-[tool.ty.src]
-exclude = [
-    # External dependencies cloned for type checking only.
-    "src/bonsai/external_dependencies",
-    # Submodules.
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill/3rdparty",
-    # Has special dependencies.
-    "src/ifcopenshell-python/ifcopenshell/geom/app.py",
-    "src/ifcopenshell-python/ifcopenshell/geom/code_editor_pane.py",
-    "src/ifcopenshell-python/ifcopenshell/util/doc.py",
-    "src/ifcopenshell-python/ifcopenshell/util/generate_pset_templates.py",
-    "src/ifcopenshell-python/ifcopenshell/util/ifc4x3dev_scrape_data_for_docs.py",
-    # Too esoteric.
-    "src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py",
-    "src/ifc2ca/templates",
-    # Too dev.
-    "src/bcf/setup.py",
-    "src/bsdd/yml_to_classes.py",
-    # Deprecated.
-    "src/ifc2ca/_deprecated",
-]
-
 [tool.poe.tasks]
 
 ruff-main = "ruff check --extend-exclude nix/build-all.py"
@@ -220,47 +87,6 @@ ruff.sequence = ["ruff-main", "ruff-old"]
 
 black = "black ."
 
-ty.sequence = ["ty-bonsai", "ty-ios"]
-ty.help = "Run ty type checker. Requires ty-venv to be set up first."
-ty-bonsai = "ty check src/bonsai --python=src/bonsai/.venv"
-
-ty-venv.sequence = ["ty-venv-bonsai", "ty-venv-ios"]
-
-ty-venv-bonsai.sequence = [
-    {cmd = "uv venv src/bonsai/.venv --python=3.11 --allow-existing"},
-    {cmd = "uv pip install -r src/bonsai/type-check-requirements.txt --python=src/bonsai/.venv"},
-]
-
-ty-venv-ios.sequence = [
-    {cmd = "uv venv src/ifcopenshell-python/.venv --python=3.10 --allow-existing"},
-    {cmd = "uv pip install -r src/ifcopenshell-python/type-check-requirements.txt --python=src/ifcopenshell-python/.venv"},
-]
-
 format.sequence = ["black", "ruff-main", "ruff-old"]
 
 cmake-format = "gersemi . --in-place"
-
-[tool.poe.tasks.ty-ios]
-# --ignore unresolved-reference: walrus operator false positives in ty.
-cmd = """
-    ty check
-    src/bcf
-    src/bsdd
-    src/ifc2ca
-    src/ifc4d
-    src/ifc5d
-    src/ifccityjson
-    src/ifcclash
-    src/ifccsv
-    src/ifcdiff
-    src/ifcfm
-    src/ifcopenshell-python
-    src/ifcpatch
-    src/ifctester
-    --python=src/ifcopenshell-python/.venv
-    --ignore unresolved-reference
-"""
-
-[tool.poe.tasks.bonsai-deps]
-help = "Clone or update Bonsai external dependencies."
-cmd = "python src/bonsai/scripts/bonsai_deps.py"

src/bcf/bcf/v3/bcfapi.py

@@ -34,8 +34,8 @@ client_id, client_secret = "", ""
 class OAuthReceiver(http.server.BaseHTTPRequestHandler):
     def do_GET(self) -> None:
         query = urllib.parse.parse_qs(urllib.parse.urlparse(self.path).query)
-        self.server.auth_code = query.get("code", [""])[0]
-        self.server.auth_state = query.get("state", [""])[0]
+        self.server.auth_code = query.get("code", [""])[0]  # type: ignore
+        self.server.auth_state = query.get("state", [""])[0]  # type: ignore
         self.send_response(200)
         self.send_header("Content-type", "text/plain")
         self.end_headers()
@@ -255,7 +255,7 @@ class BcfClient:
         project_id: str = "",
         topics: str = "",
         query_string: Optional[str] = None,
-    ) -> None:
+    ) -> list[Any]:
         # return self.get(
         #     f"/projects/{project_id}/topics",
         #     {

src/bcf/tests/v3/test_example_files.py

@@ -173,17 +173,16 @@ def assert_viewpoints(viewpoints):
     assert viewpoint.snapshot is not None
 
 
-# TODO: dead code - ported from v2 but buildingSMART/BCF-XML has no v3 MaximumInformation.bcf equivalent
 def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, expected_coloring) -> None:
     expected_vp = mdl.VisualizationInfo(
         components=mdl.Components(
+            view_setup_hints=mdl.ViewSetupHints(
+                spaces_visible=False,
+                space_boundaries_visible=False,
+                openings_visible=False,
+            ),
             selection=expected_selection,
             visibility=mdl.ComponentVisibility(
-                view_setup_hints=mdl.ViewSetupHints(
-                    spaces_visible=False,
-                    space_boundaries_visible=False,
-                    openings_visible=False,
-                ),
                 exceptions=expected_exception,
                 default_visibility=False,
             ),
@@ -194,7 +193,6 @@ def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, e
             camera_direction=mdl.Direction(x=0.6745243072509766, y=-0.6599355936050415, z=-0.33091068267822266),
             camera_up_vector=mdl.Direction(x=0.2271970510482788, y=-0.24091780185699463, z=0.9435783624649048),
             field_of_view=60,
-            aspect_ratio=1.0,
         ),
         guid="21dd4807-e9af-439e-a980-04d913a6b1ce",
     )
@@ -202,17 +200,16 @@ def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, e
     assert viewpoint.snapshot is not None
 
 
-# TODO: dead code - ported from v2 but buildingSMART/BCF-XML has no v3 MaximumInformation.bcf equivalent
 def assert_third_viewpoint(viewpoint, expected_selection, expected_exception, expected_coloring) -> None:
     expected_vp = mdl.VisualizationInfo(
         components=mdl.Components(
+            view_setup_hints=mdl.ViewSetupHints(
+                spaces_visible=False,
+                space_boundaries_visible=False,
+                openings_visible=True,
+            ),
             selection=expected_selection,
             visibility=mdl.ComponentVisibility(
-                view_setup_hints=mdl.ViewSetupHints(
-                    spaces_visible=False,
-                    space_boundaries_visible=False,
-                    openings_visible=True,
-                ),
                 exceptions=expected_exception,
                 default_visibility=True,
             ),
@@ -223,7 +220,6 @@ def assert_third_viewpoint(viewpoint, expected_selection, expected_exception, ex
             camera_direction=mdl.Direction(x=0.7232745289802551, y=0.5967116951942444, z=-0.3475759029388428),
             camera_up_vector=mdl.Direction(x=0.27662187814712524, y=0.21082592010498047, z=0.937567412853241),
             field_of_view=60,
-            aspect_ratio=1.0,
         ),
         guid="81daa431-bf01-4a49-80a2-1ab07c177717",
     )

src/bonsai/bonsai/bim/handler.py

@@ -45,19 +45,16 @@ from bonsai.bim.module.nest.decorator import NestDecorator
 
 cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()
-# Separate owner for per-object msgbus subscriptions (name, active_material_index).
-# Using a dedicated owner allows clearing all per-object subscriptions at once
-# during undo/redo without affecting other global subscriptions.
-object_subscription_owner = object()
 
 
 def name_callback(obj: Union[bpy.types.Object, bpy.types.Material], data: str) -> None:
     try:
         obj.name
     except:
-        # The object is invalid but somehow still has a callback.
-        # This can occur during undo/redo when the Python wrapper is stale.
-        return
+        # The object is invalid but somehow still has a callback. Clear all
+        # msgbus subscriptions to prevent useless further triggers.
+        bpy.msgbus.clear_by_owner(obj)
+        return  # In case the object RNA is gone during an undo / redo operation
     # Blender names are up to 63 UTF-8 bytes
     if len(bytes(obj.name, "utf-8")) >= 63:
         return
@@ -192,7 +189,7 @@ def subscribe_to(obj: bpy.types.ID, data_path: str, callback: Callable[[bpy.type
         return
     bpy.msgbus.subscribe_rna(
         key=subscribe_to,
-        owner=object_subscription_owner,
+        owner=obj,
         args=(
             obj,
             data_path,

src/bonsai/bonsai/bim/ifc.py

@@ -316,8 +316,11 @@ class IfcStore:
         del IfcStore.id_map[data["id"]]
         if "guid" in data:
             del IfcStore.guid_map[data["guid"]]
-        # Note: msgbus subscriptions are cleared globally during
-        # rebuild_element_maps which runs after every undo/redo.
+        obj = IfcStore.get_object_by_name(data["obj"])
+        if obj is None:
+            # obj was just created during this step and didn't existed before.
+            return
+        bpy.msgbus.clear_by_owner(obj)
 
     @staticmethod
     def commit_link_element(data: OperationData) -> None:
@@ -364,8 +367,10 @@ class IfcStore:
         del IfcStore.id_map[data["id"]]
         if "guid" in data:
             del IfcStore.guid_map[data["guid"]]
-        # Note: msgbus subscriptions are cleared globally during
-        # rebuild_element_maps which runs after every undo/redo.
+        obj = IfcStore.get_object_by_name(data["obj"])
+        # obj might be removed after unlink.
+        if not obj:
+            bpy.msgbus.clear_by_owner(obj)
 
     @staticmethod
     def unlink_element(

src/bonsai/bonsai/bim/import_ifc.py

@@ -64,8 +64,8 @@ class MaterialCreator:
         mesh: Union[OBJECT_DATA_TYPE, None],
         shape_has_openings: bool,
     ) -> None:
-        if (((rep := getattr(element, "Representation", ...)) is not ... and not rep) or
-            ((rep := getattr(element, "RepresentationMaps", ...)) is not ... and not rep)
+        if ((rep := getattr(element, "Representation", ...) is not ...) and not rep) or (
+            (rep := getattr(element, "RepresentationMaps", ...) is not ...) and not rep
         ):
             return
 

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

@@ -101,7 +101,7 @@ class AggregateDecorator:
         cls.is_installed = False
 
     def dotted_line_shader(self):
-        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")  # ty:ignore[too-many-positional-arguments]
+        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
         vert_out.smooth("FLOAT", "v_ArcLength")
 
         shader_info = gpu.types.GPUShaderCreateInfo()

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

@@ -230,7 +230,7 @@ class BcfTopic(PropertyGroup):
 
 
 def get_related_topics(self: "BCFProperties", context: bpy.types.Context) -> list[tuple[str, str, str]]:
-    global RELATED_TOPICS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global RELATED_TOPICS_ENUM_ITEMS
     props = self
     active_topic = props.active_topic
     active_related_topics = active_topic.related_topics.keys()

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

@@ -46,26 +46,26 @@ def get_libraries(self, context):
 
 
 def get_namespaces(self, context):
-    global NAMESPACES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global NAMESPACES_ENUM_ITEMS
     NAMESPACES_ENUM_ITEMS = [(uri, f"{alias}: {uri}", "") for alias, uri in BrickStore.namespaces]
     return NAMESPACES_ENUM_ITEMS
 
 
 def get_brick_entity_classes(self, context):
-    global ENTITY_CLASSES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global ENTITY_CLASSES_ENUM_ITEMS
     entity = self.brick_entity_create_type
     ENTITY_CLASSES_ENUM_ITEMS = [(uri, uri.split("#")[-1], "") for uri in BrickStore.entity_classes[entity]]
     return ENTITY_CLASSES_ENUM_ITEMS
 
 
 def get_brick_roots(self, context):
-    global BRICK_ROOTS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global BRICK_ROOTS_ENUM_ITEMS
     BRICK_ROOTS_ENUM_ITEMS = [(root, root, "") for root in BrickStore.root_classes]
     return BRICK_ROOTS_ENUM_ITEMS
 
 
 def get_brick_relations(self, context):
-    global BRICK_RELATIONS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global BRICK_RELATIONS_ENUM_ITEMS
     BRICK_RELATIONS_ENUM_ITEMS = [(uri, uri.split("#")[-1], "") for uri in BrickStore.relationships]
     for relation in BrickschemaData.data["active_relations"]:
         if relation["predicate_name"] == "label":

src/bonsai/bonsai/bim/module/drawing/gizmos.py

@@ -1285,7 +1285,7 @@ class SnapManager:
                     continue
 
                 coords = np.empty(vertex_count * 3, dtype=np.float32)
-                mesh.vertices.foreach_get("co", coords)
+                mesh.vertices.foreach_get("co", coords)  # type: ignore[arg-type]
                 coords = coords.reshape(-1, 3)
 
                 matrix = np.array(obj_eval.matrix_world, dtype=np.float32)

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

@@ -456,8 +456,7 @@ def format_distance(
                 tx_dist = fmt % d_cm
 
     else:
-        assert f"Unexpected unit_system - '{unit_system}'."
-        # tx_dist = fmt % value
+        tx_dist = fmt % value
 
     return tx_dist
 

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

@@ -1426,7 +1426,6 @@ class CreateDrawing(bpy.types.Operator):
                 "/Pset_.*Common/.Status",
                 "EPset_Status.Status",
                 "EPset_Status.UserDefinedStatus",
-                "Material.Name",
             ]
 
         group = root.find("{http://www.w3.org/2000/svg}g")

src/bonsai/bonsai/bim/module/drawing/shaders.py

@@ -366,6 +366,9 @@ class BaseLinesShader(BaseShader):
     }
     """
 
+    def __init__(self, gap_size=16):
+        super().__init__(gap_size=gap_size)
+
     def glenable(self):
         super().glenable()
 

src/bonsai/bonsai/bim/module/drawing/sheeter.py

@@ -132,9 +132,22 @@ class SheetBuilder:
         self.add_view_title(x, view_height + y + VIEW_TITLE_OFFSET_Y, view, layout_dir)
         layout_tree.write(layout_path)
 
+    @staticmethod
+    def _ifc_entity_exists(ifc: ifcopenshell.file, entity_id: int) -> bool:
+        try:
+            ifc.by_id(entity_id)
+            return True
+        except RuntimeError:
+            return False
+
     def next_drawing_location(self, layout_root: ET.Element, next_width: float) -> list:
         titleblocks = layout_root.findall(f'{SVG}g[@data-type="titleblock"]')
-        drawings = layout_root.findall(f'{SVG}g[@data-type="drawing"]')
+        ifc = tool.Ifc.get()
+        drawings = [
+            g
+            for g in layout_root.findall(f'{SVG}g[@data-type="drawing"]')
+            if self._ifc_entity_exists(ifc, int(g.attrib.get("data-id", "0")))
+        ]
 
         # how wide is the title block frame
         try:
@@ -403,14 +416,20 @@ class SheetBuilder:
 
         return svg
 
-    def build_drawings(self, root: ET.Element, sheet: ifcopenshell.entity_instance):
+    def build_drawings(self, root: ET.Element, sheet: ifcopenshell.entity_instance) -> None:
         for view in root.findall(f'{SVG}g[@data-type="drawing"]'):
             drawing_id = int(view.attrib["data-id"])
             try:
                 reference = tool.Ifc.get().by_id(int(view.attrib["data-id"]))
                 drawing = tool.Ifc.get().by_guid(view.attrib["data-drawing"])
             except RuntimeError:
-                # Perhaps the SVG has outdated content or is edited externally which we cannot control.
+                # The layout SVG has a drawing group whose IFC reference no longer
+                # exists. This is intentional: remove_drawing_from_sheet deliberately
+                # leaves the group in the layout SVG so that Blender's undo can restore
+                # the IFC reference and the group is still there to build from. Remove
+                # it only from the in-memory tree so it doesn't appear in the output
+                # sheet; the layout SVG file on disk is left untouched.
+                root.remove(view)
                 continue
 
             images = view.findall(f"{SVG}image")

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

@@ -1066,7 +1066,7 @@ class OverrideOutlinerDelete(bpy.types.Operator, tool.Ifc.Operator):
         cls.poll_message_set("Only available from Outliner.")
         return False
 
-    def execute(self, context):  # ty:ignore[override-of-final-method]
+    def execute(self, context):
         if len(getattr(context, "selected_ids", [])) == 0:
             return {"FINISHED"}
 
@@ -2289,7 +2289,7 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
         elif obj in pprops.clipping_planes_objs:
             self.report({"ERROR"}, "Clipping planes cannot be edited")
         elif element:
-            if not obj.data or obj.type not in ("MESH", "CURVE"):
+            if not obj.data:
                 self.report({"INFO"}, "No geometry to edit")
             elif tool.Geometry.is_locked(element):
                 self.report({"ERROR"}, lock_error_message(obj.name))

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

@@ -139,9 +139,7 @@ def update_local_coordinates(self: "BIMGeoreferenceProperties", context: bpy.typ
         tool.Georeference.set_coordinates(
             "blender",
             ifcopenshell.util.geolocation.enh2xyz(
-                local_coordinates[0],
-                local_coordinates[1],
-                local_coordinates[2],
+                *local_coordinates,
                 float(props.blender_offset_x),
                 float(props.blender_offset_y),
                 float(props.blender_offset_z),
@@ -164,9 +162,7 @@ def update_map_coordinates(self: "BIMGeoreferenceProperties", context: bpy.types
         tool.Georeference.set_coordinates(
             "blender",
             ifcopenshell.util.geolocation.enh2xyz(
-                local_coordinates[0],
-                local_coordinates[1],
-                local_coordinates[2],
+                *local_coordinates,
                 float(props.blender_offset_x),
                 float(props.blender_offset_y),
                 float(props.blender_offset_z),

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

@@ -27,7 +27,7 @@ from bonsai.bim.prop import StrProperty
 
 class BIMCityJsonProperties(PropertyGroup):
     def get_lods(self, context):
-        global LODS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+        global LODS_ENUM_ITEMS
         LODS_ENUM_ITEMS = [(item.name, "LOD" + item.name, "Level of Detail " + item.name) for item in self.lods]
         return LODS_ENUM_ITEMS
 

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

@@ -320,7 +320,7 @@ class RadianceExporterProperties(PropertyGroup):
     )
 
     def get_subcategories(self, context: bpy.types.Context) -> tool.Blender.BLENDER_ENUM_ITEMS:
-        global SUBCATEGORIES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+        global SUBCATEGORIES_ENUM_ITEMS
         if self.category in spectraldb:
             SUBCATEGORIES_ENUM_ITEMS = [(k, k, "") for k in spectraldb[self.category].keys()]
         else:

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

@@ -717,11 +717,7 @@ class EnableEditingMaterialSetItem(bpy.types.Operator):
         self.props.material_set_item_material = str(material_set_item.Material.id())
 
         self.props.material_set_item_attributes.clear()
-        bonsai.bim.helper.import_attributes(
-            material_set_item,
-            self.props.material_set_item_attributes,
-            callback=self.import_attributes_callback,
-        )
+        bonsai.bim.helper.import_attributes(material_set_item, self.props.material_set_item_attributes)
 
         if material_set_item.is_a("IfcMaterialProfile"):
             if material_set_item.Profile and material_set_item.Profile.ProfileName:
@@ -729,29 +725,6 @@ class EnableEditingMaterialSetItem(bpy.types.Operator):
 
         return {"FINISHED"}
 
-    def import_attributes_callback(
-        self, name: str, prop: Union["Attribute", None], data: dict[str, Any]
-    ) -> None | Literal[True]:
-        if data["type"] != "IfcMaterialLayer" or name != "IsVentilated" or not prop:
-            return None
-
-        # Keep null semantics unchanged on export, but avoid an empty UI selection.
-        prop.data_type = "enum"
-        prop.special_type = "LOGICAL"
-        prop.enum_items = json.dumps(("TRUE", "FALSE", "UNKNOWN"))
-
-        value = data[name]
-        if value == "UNKNOWN":
-            prop.enum_value = "UNKNOWN"
-        elif value is None:
-            # Keep visible default as FALSE, but preserve null semantics on save.
-            prop.enum_value = "FALSE"
-            prop.is_null = True
-        else:
-            prop.enum_value = "TRUE" if value else "FALSE"
-
-        return True
-
 
 class DisableEditingMaterialSetItem(bpy.types.Operator):
     bl_idname = "bim.disable_editing_material_set_item"

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

@@ -227,7 +227,7 @@ class FitFlowSegments(bpy.types.Operator, tool.Ifc.Operator):
             is_parallel21 = tool.Cad.is_x(angle21, (0, 180), tolerance=0.001)
             is_parallel23 = tool.Cad.is_x(angle23, (0, 180), tolerance=0.001)
 
-            if not all([is_parallel12, is_parallel13, is_parallel21, is_parallel23]):
+            if not all(is_parallel12, is_parallel13, is_parallel21, is_parallel23):
                 fitting_type = "WYE"
 
         if not fitting_type:
@@ -903,7 +903,7 @@ class MEPAddBend(bpy.types.Operator, tool.Ifc.Operator):
     start_segment_id: bpy.props.IntProperty(name="Start Segment Element ID", default=0)
     end_segment_id: bpy.props.IntProperty(name="End Segment Element ID", default=0)
     radius: bpy.props.FloatProperty(
-        name="Bend Inner Radius", description="Bend inner radius in SI units", default=0.2, subtype="DISTANCE", min=0
+        "Bend Inner Radius", description="Bend inner radius in SI units", default=0.2, subtype="DISTANCE", min=0
     )
 
     def _execute(self, context):

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

@@ -540,16 +540,6 @@ class AddBoolean(Operator, tool.Ifc.Operator):
         booleans = ifcopenshell.api.geometry.add_boolean(tool.Ifc.get(), first_item, second_items, props.operator)
 
         rep_obj = tool.Geometry.get_geometry_props().representation_obj
-        if booleans:
-            # Users typically select two top-level items and expect the
-            # operand to be absorbed into the boolean, not remain as a
-            # standalone item alongside it.
-            representation = tool.Geometry.get_active_representation(rep_obj)
-            representation = ifcopenshell.util.representation.resolve_representation(representation)
-            second_items_set = set(second_items)
-            new_items = [i for i in representation.Items if i not in second_items_set]
-            if new_items:
-                representation.Items = new_items
         rep_element = tool.Ifc.get_entity(rep_obj)
         tool.Model.mark_manual_booleans(rep_element, booleans)
         tool.Geometry.reload_representation(rep_obj)

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

@@ -694,14 +694,10 @@ def generate_box(usecase_path: str, ifc_file: ifcopenshell.file, settings: dict[
 
         new_settings = settings.copy()
         new_settings["context"] = box_context
-        new_box = ifcopenshell.api.geometry.add_representation(
-            ifc_file,
-            should_run_listeners=False,  # ty:ignore[unknown-argument]
-            **new_settings,
-        )
+        new_box = ifcopenshell.api.geometry.add_representation(ifc_file, should_run_listeners=False, **new_settings)
         ifcopenshell.api.geometry.assign_representation(
             ifc_file,
-            should_run_listeners=False,  # ty:ignore[unknown-argument]
+            should_run_listeners=False,
             product=product,
             representation=new_box,
         )

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

@@ -18,7 +18,7 @@
 
 import copy
 from math import atan2, degrees, pi, radians
-from typing import TYPE_CHECKING, Any, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 import bpy
 import ifcopenshell
@@ -49,7 +49,7 @@ ProfileFrom2PointsReturn = Union[dict[str, Any], None]
 
 
 class DumbProfileGenerator:
-    def __init__(self, relating_type: ifcopenshell.entity_instance):
+    def __init__(self, relating_type):
         self.relating_type = relating_type
         self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
 
@@ -201,7 +201,7 @@ class DumbProfileGenerator:
 
 
 class DumbProfileRegenerator:
-    def regenerate_from_profile_def(self, profile: ifcopenshell.entity_instance) -> None:
+    def regenerate_from_profile_def(self, profile):
         self.file = tool.Ifc.get()
         objs = []
         if not profile:
@@ -221,7 +221,7 @@ class DumbProfileRegenerator:
         for element in self.get_element_types_using_profile(profile):
             tool.Model.mark_thumbnail_for_update(element)
 
-    def regenerate_from_profile(self, usecase_path: str, ifc_file: ifcopenshell.file, settings: dict[str, Any]) -> None:
+    def regenerate_from_profile(self, usecase_path, ifc_file, settings):
         self.file = ifc_file
         objs = []
         profile = settings["profile"].Profile
@@ -233,7 +233,7 @@ class DumbProfileRegenerator:
                 objs.append(obj)
         DumbProfileRecalculator().recalculate(objs)
 
-    def get_elements_using_profile(self, profile: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]:
+    def get_elements_using_profile(self, profile):
         results = []
         profile_sets = [
             mp.ToMaterialProfileSet[0] for mp in self.file.get_inverse(profile) if mp.is_a("IfcMaterialProfile")
@@ -252,9 +252,7 @@ class DumbProfileRegenerator:
                         results.extend(rel.RelatedObjects)
         return results
 
-    def get_element_types_using_profile(
-        self, profile: ifcopenshell.entity_instance
-    ) -> list[ifcopenshell.entity_instance]:
+    def get_element_types_using_profile(self, profile):
         results = []
         profile_sets = [
             mp.ToMaterialProfileSet[0] for mp in self.file.get_inverse(profile) if mp.is_a("IfcMaterialProfile")
@@ -271,18 +269,12 @@ class ExtendProfile(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.extend_profile"
     bl_label = "Extend Profile"
     bl_options = {"REGISTER", "UNDO"}
-    join_type: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
-        items=[("-", "Unjoin", ""), ("L", "L", ""), ("V", "V", ""), ("T", "T", "")],
-        default="-",
-    )
-
-    if TYPE_CHECKING:
-        join_type: Literal["-", "L", "V", "T"]
+    join_type: bpy.props.StringProperty()
 
     def _execute(self, context):
         selected_objs = context.selected_objects
         joiner = DumbProfileJoiner()
-        if self.join_type == "-":
+        if not self.join_type:
             for obj in selected_objs:
                 joiner.unjoin(obj)
             return {"FINISHED"}
@@ -634,15 +626,11 @@ class DumbProfileJoiner:
             if connection1 == "ATEND":
                 if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                     plane = self.get_profile_plane(profile2, furthest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     self.body[1] = intersect
                 else:
                     plane = self.get_profile_plane(profile2, furthest_plane, z_inwards=False)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     max_dim = self.get_max_bound_box_dimension(profile1)
                     self.body[1] = intersect + profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
 
@@ -685,15 +673,11 @@ class DumbProfileJoiner:
             elif connection1 == "ATSTART":
                 if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                     plane = self.get_profile_plane(profile2, furthest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     self.body[0] = intersect
                 else:
                     plane = self.get_profile_plane(profile2, furthest_plane, z_inwards=False)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     max_dim = self.get_max_bound_box_dimension(profile1)
                     self.body[0] = intersect - profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
 
@@ -737,9 +721,7 @@ class DumbProfileJoiner:
             if connection1 == "ATEND":
                 if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                     plane = self.get_profile_plane(profile2, furthest_plane if is_relating else closest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     self.body[1] = intersect
                 else:
                     plane = self.get_profile_plane(
@@ -747,9 +729,7 @@ class DumbProfileJoiner:
                         furthest_plane if is_relating else closest_plane,
                         z_inwards=False if is_relating else True,
                     )
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     max_dim = self.get_max_bound_box_dimension(profile1)
                     self.body[1] = intersect + profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
                     self.clippings.append(
@@ -762,9 +742,7 @@ class DumbProfileJoiner:
             elif connection1 == "ATSTART":
                 if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                     plane = self.get_profile_plane(profile2, furthest_plane if is_relating else closest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     self.body[0] = intersect
                 else:
                     plane = self.get_profile_plane(
@@ -772,9 +750,7 @@ class DumbProfileJoiner:
                         furthest_plane if is_relating else closest_plane,
                         z_inwards=False if is_relating else True,
                     )
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                     max_dim = self.get_max_bound_box_dimension(profile1)
                     self.body[0] = intersect - profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
                     self.clippings.append(

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

@@ -31,11 +31,11 @@ def calculate_quantities(usecase_path, ifc_file: ifcopenshell.file, settings):
         return
     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"  # ty:ignore[unknown-argument]
+        ifc_file, should_run_listeners=False, product=task, name="Qto_TaskBaseQuantities"
     )
     ifcopenshell.api.pset.edit_qto(
         ifc_file,
-        should_run_listeners=False,  # ty:ignore[unknown-argument]
+        should_run_listeners=False,
         qto=qto,
         properties={
             "StandardWork": ifcopenshell.util.date.ifc2datetime(element.ScheduleDuration).days,

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

@@ -1268,6 +1268,27 @@ class DumbWallJoiner:
         bonsai.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=wall2)
         return wall2
 
+    def join_Z(self, wall1, slab2):
+        element1 = tool.Ifc.get_entity(wall1)
+        element2 = tool.Ifc.get_entity(slab2)
+
+        for rel in element1.ConnectedFrom:
+            if rel.is_a() == "IfcRelConnectsElements" and rel.Description == "TOP":
+                ifcopenshell.api.geometry.disconnect_element(
+                    tool.Ifc.get(),
+                    relating_element=rel.RelatingElement,
+                    related_element=element1,
+                )
+
+        ifcopenshell.api.geometry.connect_element(
+            tool.Ifc.get(),
+            relating_element=element2,
+            related_element=element1,
+            description="TOP",
+        )
+
+        tool.Model.recreate_wall(element1, wall1)
+
     def set_axis(self, wall, p1, p2):
         axis = ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Plan", "Axis", "GRAPH_VIEW")
         builder = ifcopenshell.util.shape_builder.ShapeBuilder(tool.Ifc.get())
@@ -1312,6 +1333,29 @@ class DumbWallJoiner:
         self.set_axis(element1, p1, p2)
         tool.Model.recreate_wall(element1, wall1)
 
+    def join_T(self, wall1: bpy.types.Object, wall2: bpy.types.Object) -> None:
+        element1 = tool.Ifc.get_entity(wall1)
+        element2 = tool.Ifc.get_entity(wall2)
+        axis1 = tool.Model.get_wall_axis(wall1)
+        axis2 = tool.Model.get_wall_axis(wall2)
+        intersect = tool.Cad.intersect_edges(axis1["reference"], axis2["reference"])
+        if intersect:
+            intersect, _ = intersect
+        else:
+            return
+        connection = "ATEND" if tool.Cad.edge_percent(intersect, axis1["reference"]) > 0.5 else "ATSTART"
+
+        ifcopenshell.api.geometry.connect_path(
+            tool.Ifc.get(),
+            related_element=element1,
+            relating_element=element2,
+            relating_connection="ATPATH",
+            related_connection=connection,
+            description="BUTT",
+        )
+
+        tool.Model.recreate_wall(element1, wall1, axis1["reference"], axis1["reference"])
+
     def connect(self, obj1: bpy.types.Object, obj2: bpy.types.Object) -> None:
         wall1 = tool.Ifc.get_entity(obj1)
         wall2 = tool.Ifc.get_entity(obj2)

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

@@ -101,7 +101,7 @@ class NestDecorator:
         cls.is_installed = False
 
     def dotted_line_shader(self):
-        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")  # ty:ignore[too-many-positional-arguments]
+        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
         vert_out.smooth("FLOAT", "v_ArcLength")
 
         shader_info = gpu.types.GPUShaderCreateInfo()

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

@@ -321,7 +321,7 @@ def get_gross_perimeter(o: bpy.types.Object) -> float:
     return gross_perimeter
 
 
-def get_space_net_perimeter(obj: bpy.types.Object) -> None:
+def get_space_net_perimeter(obj: bpy.types.Object) -> float:
     pass
 
 

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

@@ -619,7 +619,7 @@ class SelectFilterElements(bpy.types.Operator):
         return {"FINISHED"}
 
 
-class ApplyFilterFromText(Operator):
+class ApplyFilterFromText(Operator, tool.Ifc.Operator):
     bl_idname = "bim.apply_filter_from_text"
     bl_label = "Apply Filter Configuration"
     bl_description = "Apply the JSON filter configuration from the current text block"
@@ -1440,7 +1440,7 @@ class ShowAllElements(Operator):
         return {"FINISHED"}
 
 
-class SelectSimilar(Operator):
+class SelectSimilar(Operator, tool.Ifc.Operator):
     bl_idname = "bim.select_similar"
     bl_label = "Select Similar"
     bl_options = {"REGISTER", "UNDO"}

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

@@ -28,7 +28,6 @@ import ifcopenshell.util.representation
 import ifcopenshell.util.unit
 import ifcopenshell.util.unit as ifcunit
 import numpy as np
-import numpy.typing as npt
 from mathutils import Vector
 
 import bonsai.tool as tool
@@ -479,7 +478,7 @@ class ShaderInfo:
         """get the args to the point shader"""
         location = np.array(location)
         indices = []
-        direction_dict: dict[str, tuple[npt.NDArray, ...]] = {
+        direction_dict = {
             "fx": (np.array((1, 0, 0)), np.array((0, 1, 0)), np.array((0, 0, 1))),
             "fy": (np.array((0, 1, 0)), np.array((1, 0, 0)), np.array((0, 0, 1))),
             "fz": (np.array((0, 0, 1)), np.array((0, 1, 0)), np.array((1, 0, 0))),

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

@@ -83,7 +83,7 @@ class DecorationShader:
         PARALLEL DISTRIBUTED FORCE,
         DISTRIBUTED MOMENT,
         """
-        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")  # ty:ignore[too-many-positional-arguments]
+        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
         vert_out.smooth("VEC3", "forces")
         vert_out.smooth("VEC3", "co")
 
@@ -203,7 +203,7 @@ class DecorationShader:
         """param: pattern: type of pattern
         SINGLE FORCE,
         SINGLE MOMENT"""
-        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")  # ty: ignore[too-many-positional-arguments]
+        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
         vert_out.smooth("VEC3", "co")
 
         shader_info = gpu.types.GPUShaderCreateInfo()
@@ -253,7 +253,7 @@ class DecorationShader:
 
     def get_planar_shader(self) -> gpu.types.GPUShader:
         """shader for planar loads"""
-        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")  # ty: ignore[too-many-positional-arguments]
+        vert_out = gpu.types.GPUStageInterfaceInfo("my_interface")
         vert_out.smooth("VEC3", "co")
 
         shader_info = gpu.types.GPUShaderCreateInfo()

src/bonsai/bonsai/bim/ui.py

@@ -787,6 +787,7 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
         doc: DocPreferences
         default_parameters: DefaultParameters
         container_hide_show_isolate: bool
+        mass_time_units_in_wizard: bool
         chain_filter_with_set_operations: bool
         save_metadata_blend_file: bool
         metadata_blend_file_suffix: str
@@ -985,6 +986,7 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
 
     def draw_extras_settings(self, layout: bpy.types.UILayout, context: bpy.types.Context) -> None:
         layout.prop(self, "container_hide_show_isolate")
+        layout.prop(self, "mass_time_units_in_wizard")
         row = layout.row(align=True)
         row.prop(self, "chain_filter_with_set_operations")
         row.operator("bim.open_uri", text="", icon="HELP").uri = "https://community.osarch.org/discussion/3270"

src/bonsai/bonsai/core/covering.py

@@ -51,11 +51,21 @@ def add_instance_flooring_covering_from_cursor(
     if isinstance(space_polygon, str):
         return
 
-    obj = spatial.create_object("Covering")
+    bm = spatial.get_bmesh_from_polygon(space_polygon, h=0, polygon_is_si=True)
+    name = "Covering"
+    mesh = spatial.get_named_mesh_from_bmesh(name=name, bmesh=bm)
+
+    obj = spatial.get_named_obj_from_mesh(name, mesh)
+
     spatial.set_obj_origin_to_cursor_position_and_zero_elevation(obj)
     spatial.translate_obj_to_z_location(obj, z)
+    points = spatial.get_2d_vertices_from_obj(obj)
+    points = spatial.get_scaled_2d_vertices(points)
     spatial.assign_type_to_obj(obj)
-    spatial.set_covering_representation_from_polygon(obj, space_polygon, polygon_is_si=True)
+
+    spatial.assign_swept_area_outer_curve_from_2d_vertices(obj, vertices=points)
+    body = spatial.get_body_representation(obj)
+    spatial.regen_obj_representation(obj, body)
 
 
 def add_instance_ceiling_covering_from_cursor(
@@ -85,11 +95,21 @@ def add_instance_ceiling_covering_from_cursor(
     if isinstance(space_polygon, str):
         return
 
-    obj = spatial.create_object("Covering")
+    bm = spatial.get_bmesh_from_polygon(space_polygon, h=0, polygon_is_si=True)
+    name = "Covering"
+    mesh = spatial.get_named_mesh_from_bmesh(name=name, bmesh=bm)
+
+    obj = spatial.get_named_obj_from_mesh(name, mesh)
+
     spatial.set_obj_origin_to_cursor_position_and_zero_elevation(obj)
     spatial.translate_obj_to_z_location(obj, z + ceiling_height)
+    points = spatial.get_2d_vertices_from_obj(obj)
+    points = spatial.get_scaled_2d_vertices(points)
     spatial.assign_type_to_obj(obj)
-    spatial.set_covering_representation_from_polygon(obj, space_polygon, polygon_is_si=True)
+
+    spatial.assign_swept_area_outer_curve_from_2d_vertices(obj, vertices=points)
+    body = spatial.get_body_representation(obj)
+    spatial.regen_obj_representation(obj, body)
 
 
 def regen_selected_covering_object(root: type[tool.Root], spatial: type[tool.Spatial]) -> None:
@@ -107,7 +127,19 @@ def regen_selected_covering_object(root: type[tool.Root], spatial: type[tool.Spa
     if isinstance(space_polygon, str):
         return
 
-    spatial.set_covering_representation_from_polygon(active_obj, space_polygon, polygon_is_si=True)
+    bm = spatial.get_bmesh_from_polygon(space_polygon, h=0, polygon_is_si=True)
+
+    name = "Aux"
+    mesh = spatial.get_named_mesh_from_bmesh(name=name, bmesh=bm)
+    mesh = spatial.get_transformed_mesh_from_local_to_global(mesh)
+    obj = spatial.get_named_obj_from_mesh(name, mesh)
+
+    points = spatial.get_2d_vertices_from_obj(obj)
+    points = spatial.get_scaled_2d_vertices(points)
+
+    spatial.assign_swept_area_outer_curve_from_2d_vertices(active_obj, vertices=points)
+    body = spatial.get_body_representation(active_obj)
+    spatial.regen_obj_representation(active_obj, body)
 
 
 # TODO CHECK IF IT IS POSSIBLE TO CREATE ONLY ONE CORE FUNCTION FOR _FROM_WALLS
@@ -119,13 +151,22 @@ def add_instance_flooring_coverings_from_walls(root: type[tool.Root], spatial: t
     union = spatial.get_union_shape_from_selected_objects()
     for i, linear_ring in enumerate(union.interiors):
         poly = spatial.get_buffered_poly_from_linear_ring(linear_ring)
+        bm = spatial.get_bmesh_from_polygon(poly, h=0, polygon_is_si=False)
 
         name = "Covering" + str(i)
-        obj = spatial.create_object(name)
-        spatial.set_obj_origin_to_polygon_center(obj, poly, polygon_is_si=False)
+        obj = spatial.get_named_obj_from_bmesh(name, bmesh=bm)
+
+        spatial.set_obj_origin_to_bboxcenter(obj)
         spatial.translate_obj_to_z_location(obj, z)
+
+        points = spatial.get_2d_vertices_from_obj(obj)
+        points = spatial.get_scaled_2d_vertices(points)
+
         spatial.assign_type_to_obj(obj)
-        spatial.set_covering_representation_from_polygon(obj, poly, polygon_is_si=False)
+
+        spatial.assign_swept_area_outer_curve_from_2d_vertices(obj, vertices=points)
+        body = spatial.get_body_representation(obj)
+        spatial.regen_obj_representation(obj, body)
 
 
 def add_instance_ceiling_coverings_from_walls(
@@ -138,13 +179,22 @@ def add_instance_ceiling_coverings_from_walls(
     union = spatial.get_union_shape_from_selected_objects()
     for i, linear_ring in enumerate(union.interiors):
         poly = spatial.get_buffered_poly_from_linear_ring(linear_ring)
+        bm = spatial.get_bmesh_from_polygon(poly, h=0, polygon_is_si=False)
 
         name = "Covering" + str(i)
-        obj = spatial.create_object(name)
-        spatial.set_obj_origin_to_polygon_center(obj, poly, polygon_is_si=False)
+        obj = spatial.get_named_obj_from_bmesh(name, bmesh=bm)
+
+        spatial.set_obj_origin_to_bboxcenter(obj)
         spatial.translate_obj_to_z_location(obj, z)
+
+        points = spatial.get_2d_vertices_from_obj(obj)
+        points = spatial.get_scaled_2d_vertices(points)
+
         spatial.assign_type_to_obj(obj)
-        spatial.set_covering_representation_from_polygon(obj, poly, polygon_is_si=False)
+
+        spatial.assign_swept_area_outer_curve_from_2d_vertices(obj, vertices=points)
+        body = spatial.get_body_representation(obj)
+        spatial.regen_obj_representation(obj, body)
 
 
 class NoDefaultContainer(Exception):

src/bonsai/bonsai/core/drawing.py

@@ -432,7 +432,10 @@ def update_drawing_name(
     if drawing_tool.get_name(drawing) != name:
         ifc.run("attribute.edit_attributes", product=drawing, attributes={"Name": name})
 
-    drawing_tool.set_camera_name(drawing, name)
+    # Update the camera object name
+    camera = ifc.get_object(drawing)
+    if camera and camera.name != name:
+        camera.name = name
 
     group = drawing_tool.get_drawing_group(drawing)
     if drawing_tool.get_name(group) != name:

src/bonsai/bonsai/core/model.py

@@ -109,7 +109,7 @@ def align_walls(
     align_type: AlignType,
 ):
     reference_obj = blender.get_active_object(is_selected=True)
-    if not reference_obj or not (e := ifc.get_entity(reference_obj)) or not model.get_usage_type(e) == "LAYER2":
+    if not (e := ifc.get_entity(reference_obj) or not model.get_usage_type(e) == "LAYER2"):
         reference_obj = None
     objs = [
         o
@@ -159,6 +159,48 @@ def extend_wall_to_slab(
     model.reload_body_representation(wall_objs)
 
 
+def join_walls_TZ(
+    ifc: type[tool.Ifc],
+    blender: type[tool.Blender],
+    geometry: type[tool.Geometry],
+    joiner: DumbWallJoiner,
+    model: type[tool.Model],
+) -> None:
+    selected_objs = [
+        o
+        for o in blender.get_selected_objects()
+        if (e := ifc.get_entity(o)) and model.get_usage_type(e) in ("LAYER2", "LAYER3")
+    ]
+    if len(selected_objs) < 2:
+        raise RequireAtLeastTwoLayeredElements(
+            "Two or more vertically or horizontally layered elements must be selected to connect their paths together"
+        )
+
+    for obj in selected_objs:
+        geometry.clear_scale(obj)
+
+    elements = [ifc.get_entity(o) for o in blender.get_selected_objects()]
+    layer2_elements = []
+    layer3_elements = []
+    for element in elements:
+        usage = model.get_usage_type(element)
+        if usage == "LAYER2":
+            layer2_elements.append(element)
+        elif usage == "LAYER3":
+            layer3_elements.append(element)
+    if layer3_elements:
+        target = ifc.get_object(layer3_elements[0])
+        for element in layer2_elements:
+            joiner.join_Z(ifc.get_object(element), target)
+    else:
+        if not (active_obj := blender.get_active_object()):
+            active_obj = selected_objs[0]
+        for obj in selected_objs:
+            if obj == active_obj:
+                continue
+            joiner.join_T(obj, active_obj)
+
+
 class RequireTwoWallsError(Exception):
     pass
 

src/bonsai/bonsai/core/spatial.py

@@ -219,8 +219,13 @@ def generate_space(
         else:
             assert space_polygon
 
+    bm = spatial.get_bmesh_from_polygon(space_polygon, h=h, polygon_is_si=True)
+
+    mesh = spatial.get_named_mesh_from_bmesh(name="Space", bmesh=bm)
+
     if element and element.is_a("IfcSpace"):
-        spatial.set_space_representation_from_polygon(active_obj, element, space_polygon, h, polygon_is_si=True)
+        mesh = spatial.get_transformed_mesh_from_local_to_global(mesh)
+        spatial.edit_active_space_obj_from_mesh(mesh)
         spatial.translate_obj_to_z_location(active_obj, z)
     else:
         if relating_type:
@@ -228,13 +233,12 @@ def generate_space(
         else:
             name = "Space"
 
-        obj = spatial.create_object(name)
+        obj = spatial.get_named_obj_from_mesh(name, mesh)
         spatial.set_obj_origin_to_cursor_position_and_zero_elevation(obj)
         spatial.translate_obj_to_z_location(obj, z)
         spatial.assign_ifcspace_class_to_obj(obj)
 
         element = ifc.get_entity(obj)
-        spatial.set_space_representation_from_polygon(obj, element, space_polygon, h, polygon_is_si=True)
 
         if relating_type:
             spatial.assign_relating_type_to_element(ifc, type, element, relating_type)
@@ -253,16 +257,16 @@ def generate_spaces_from_walls(
     for i, linear_ring in enumerate(union.interiors):
         poly = spatial.get_buffered_poly_from_linear_ring(linear_ring)
 
+        bm = spatial.get_bmesh_from_polygon(poly, h, polygon_is_si=False)
+
         name = "Space" + str(i)
 
-        obj = spatial.create_object(name)
-        spatial.set_obj_origin_to_polygon_center(obj, poly, polygon_is_si=False)
+        obj = spatial.get_named_obj_from_bmesh(name, bmesh=bm)
+
+        spatial.set_obj_origin_to_bboxcenter_and_zero_elevation(obj)
         spatial.translate_obj_to_z_location(obj, z)
         spatial.assign_ifcspace_class_to_obj(obj)
 
-        element = ifc.get_entity(obj)
-        spatial.set_space_representation_from_polygon(obj, element, poly, h, polygon_is_si=False)
-
 
 def toggle_space_visibility(ifc: type[tool.Ifc], spatial: type[tool.Spatial]) -> None:
     model = ifc.get()

src/bonsai/bonsai/core/tool.py

@@ -349,10 +349,7 @@ class Drawing:
     def enable_editing_text(cls, obj): pass
     def ensure_unique_drawing_name(cls, name): pass
     def ensure_unique_identification(cls, identification): pass
-    def export_font_size(cls, obj): pass
-    def export_symbol(cls, obj): pass
     def export_text_literal_attributes(cls, obj): pass
-    def export_wrap_length(cls, obj): pass
     def generate_drawing_matrix(cls, target_view, location_hint): pass
     def generate_drawing_name(cls, target_view, location_hint): pass
     def generate_reference_attributes(cls, reference, **attributes): pass
@@ -405,7 +402,6 @@ class Drawing:
     def run_root_assign_class(cls, obj=None, ifc_class=None, predefined_type=None, should_add_representation=True, context=None, ifc_representation_class=None): pass
     def run_type_assign_type(cls, element=None, relating_type=None): pass
     def select_assigned_product(cls, drawing): pass
-    def set_camera_name(cls, drawing, name): pass
     def set_drawing_collection_name(cls, drawing, collection): pass
     def set_name(cls, element, name): pass
     def setup_annotation_object(cls, obj, object_type): pass
@@ -624,10 +620,7 @@ class Model:
     def import_rectangle(cls, obj, position, profile): pass
     def load_openings(cls, openings): pass
     def purge_scene_openings(cls): pass
-    def recalculate_walls(cls, objs): pass
     def regenerate_array(cls, parent, data): pass
-    def regenerate_profile(cls, obj): pass
-    def regenerate_slab(cls, obj): pass
     def reload_body_representation(cls, obj_or_objects): pass
     def replace_object_ifc_representation(cls, ifc_file, ifc_context, obj, new_representation): pass
 
@@ -999,12 +992,14 @@ class Spatial:
     def get_purged_inner_holes_poly(cls, union_geom, min_area): pass
     def get_poly_valid_interior_list(cls, poly, min_area, interiors_list): pass
     def get_buffered_poly_from_linear_ring(cls, linear_ring): pass
-    def get_2d_vertices_from_polygon(cls, poly, obj, polygon_is_si=True): pass
-    def set_extrusion_representation_from_polygon(cls, obj, element, poly, depth_ifc, polygon_is_si=True): pass
-    def set_space_representation_from_polygon(cls, obj, element, poly, h, polygon_is_si=True): pass
-    def set_covering_representation_from_polygon(cls, obj, poly, polygon_is_si=True): pass
-    def create_object(cls, name): pass
-    def set_obj_origin_to_polygon_center(cls, obj, poly, polygon_is_si=True): pass
+    def get_bmesh_from_polygon(cls, poly, h, polygon_is_si=False): pass
+    def get_named_obj_from_bmesh(cls, name, bmesh): pass
+    def get_named_obj_from_mesh(cls, name, mesh): pass
+    def get_named_mesh_from_bmesh(cls, name, bmesh): pass
+    def get_transformed_mesh_from_local_to_global(cls, mesh): pass
+    def edit_active_space_obj_from_mesh(cls, mesh): pass
+    def set_obj_origin_to_bboxcenter(cls, obj): pass
+    def set_obj_origin_to_bboxcenter_and_zero_elevation(cls, obj): pass
     def set_obj_origin_to_cursor_position_and_zero_elevation(cls, obj): pass
     def get_selected_objects(cls): pass
     def get_active_obj(cls): pass
@@ -1012,9 +1007,14 @@ class Spatial:
     def get_active_obj_height(cls): pass
     def get_relating_type_id(cls): pass
     def translate_obj_to_z_location(cls, obj, z): pass
+    def get_2d_vertices_from_obj(cls, obj): pass
+    def get_scaled_2d_vertices(cls, points): pass
+    def assign_swept_area_outer_curve_from_2d_vertices(cls, obj, vertices): pass
+    def get_body_representation(cls, obj): pass
     def assign_ifcspace_class_to_obj(cls, obj): pass
     def assign_type_to_obj(cls, obj): pass
     def assign_relating_type_to_element(cls, ifc, type, element, relating_type): pass
+    def regen_obj_representation(cls, obj, body): pass
     def toggle_spaces_visibility_wired_and_textured(cls, spaces): pass
     def toggle_hide_spaces(cls, spaces): pass
     def set_default_container(cls, container): pass
@@ -1119,8 +1119,6 @@ class Type:
     def get_representation_context(cls, representation): pass
     def get_type_occurrences(cls, element_type): pass
     def has_material_usage(cls, element): pass
-    def record_material_usage_attributes(cls, element): pass
-    def restore_material_usage_attributes(cls, element, usage_attributes): pass
     def run_geometry_add_representation(cls, obj=None, context=None, ifc_representation_class=None, profile_set_usage=None): pass
     def run_geometry_switch_representation(cls, obj=None, representation=None): pass
 

src/bonsai/bonsai/tool/aggregate.py

@@ -49,40 +49,21 @@ class Aggregate(bonsai.core.tool.Aggregate):
         related_object = tool.Ifc.get_entity(related_obj)
         if not relating_object or not related_object:
             return False
-        if relating_object == related_object:
-            return False
-
-        is_compatible_class = False
         if (relating_object.is_a("IfcElement") or relating_object.is_a("IfcElementType")) and related_object.is_a(
             "IfcElement"
         ):
-            is_compatible_class = True
-        elif tool.Ifc.get_schema() == "IFC2X3":
+            return True
+        if tool.Ifc.get_schema() == "IFC2X3":
             if relating_object.is_a("IfcSpatialStructureElement") and related_object.is_a("IfcSpatialStructureElement"):
-                is_compatible_class = True
-            elif relating_object.is_a("IfcProject") and related_object.is_a("IfcSpatialStructureElement"):
-                is_compatible_class = True
+                return True
+            if relating_object.is_a("IfcProject") and related_object.is_a("IfcSpatialStructureElement"):
+                return True
         else:
             if relating_object.is_a("IfcSpatialElement") and related_object.is_a("IfcSpatialElement"):
-                is_compatible_class = True
-            elif relating_object.is_a("IfcProject") and related_object.is_a("IfcSpatialElement"):
-                is_compatible_class = True
-
-        if not is_compatible_class:
-            return False
-
-        # Prevent cyclic references: walk up the full hierarchy from the
-        # proposed parent and reject if we encounter the proposed child.
-        ancestor = ifcopenshell.util.element.get_parent(relating_object)
-        seen = {relating_object}
-        while ancestor:
-            if ancestor == related_object:
-                return False
-            if ancestor in seen:
-                break
-            seen.add(ancestor)
-            ancestor = ifcopenshell.util.element.get_parent(ancestor)
-        return True
+                return True
+            if relating_object.is_a("IfcProject") and related_object.is_a("IfcSpatialElement"):
+                return True
+        return False
 
     @classmethod
     def has_physical_body_representation(cls, element: ifcopenshell.entity_instance) -> bool:

src/bonsai/bonsai/tool/bsdd.py

@@ -32,8 +32,6 @@ import bonsai.core.tool
 import bonsai.tool as tool
 
 if TYPE_CHECKING:
-    from bsdd.bsdd import ClassContractV1, ClassPropertyContractV1, PropertyContractV5
-
     from bonsai.bim.module.bsdd.prop import BIMBSDDProperties, BSDDDictionary
 
 
@@ -41,8 +39,8 @@ class Bsdd(bonsai.core.tool.Bsdd):
     default_identifier_url = "https://identifier.buildingsmart.org"
     default_api_url = "https://api.bsdd.buildingsmart.org/api/"
     client = bsdd.Client()
-    bsdd_classes: dict[str, ClassContractV1] = {}
-    bsdd_properties: dict[str, ClassPropertyContractV1 | PropertyContractV5] = {}
+    bsdd_classes: dict[str, dict] = {}
+    bsdd_properties: dict[str, dict] = {}
 
     @classmethod
     def identifier_url(cls) -> str:
@@ -269,8 +267,7 @@ class Bsdd(bonsai.core.tool.Bsdd):
     @classmethod
     def get_bsdd_property(cls, uri: str) -> dict:
         if not (bsdd_property := cls.bsdd_properties.get(uri, {})):
-            # Cache miss occurs for keyword search mode, for classes cache is prepopulated.
-            bsdd_property = cls.client.get_property(uri)
+            bsdd_property = cls.client.get_property(uri, include_classes=True)
             cls.bsdd_properties[uri] = bsdd_property
         return bsdd_property
 

src/bonsai/bonsai/tool/cost.py

@@ -154,7 +154,7 @@ class Cost(bonsai.core.tool.Cost):
         device = aud.Device()
         # chaching.mp3 is by Lucish_ CC-BY-3.0 https://freesound.org/people/Lucish_/sounds/554841/
         filepath = tool.Blender.get_data_dir_path("chaching.mp3").__str__()
-        sound = aud.Sound(filepath)  # ty:ignore[too-many-positional-arguments]
+        sound = aud.Sound(filepath)
         device.play(sound)
 
     @classmethod

src/bonsai/bonsai/tool/drawing.py

@@ -857,8 +857,6 @@ class Drawing(bonsai.core.tool.Drawing):
 
     @classmethod
     def edit_text_literals(cls, obj: bpy.types.Object, literal_attributes: dict) -> None:
-        if not literal_attributes:
-            return
         assert (element := tool.Ifc.get_entity(obj))
         assert (rep := cls.get_annotation_representation(element))
         to_remove = [i for i in rep.Items if i.is_a("IfcTextLiteral")]
@@ -1290,12 +1288,6 @@ class Drawing(bonsai.core.tool.Drawing):
     def get_representation(cls, element, context):
         return ifcopenshell.util.representation.get_representation(element, context)
 
-    @classmethod
-    def set_camera_name(cls, drawing: ifcopenshell.entity_instance, name: str) -> None:
-        camera = tool.Ifc.get_object(drawing)
-        if camera and camera.name != name:
-            camera.name = name
-
     @classmethod
     def set_drawing_collection_name(
         cls, drawing: ifcopenshell.entity_instance, collection: bpy.types.Collection
@@ -2846,13 +2838,12 @@ class Drawing(bonsai.core.tool.Drawing):
 
     @classmethod
     def remove_drawing_from_sheet(cls, reference: ifcopenshell.entity_instance) -> None:
-        import bonsai.bim.module.drawing.sheeter as sheeter
-
-        sheet = tool.Drawing.get_reference_document(reference)
-
-        sheet_builder = sheeter.SheetBuilder()
-        sheet_builder.remove_drawing(reference, sheet)
-
+        # NOTE: The layout SVG is intentionally NOT modified here. Removing the
+        # drawing group from the SVG file would make the change non-undoable
+        # (Blender's undo restores IFC state but not files on disk). Instead,
+        # build_drawings() detects and removes stale groups (those whose IFC
+        # reference no longer exists) the next time the sheet is built, and also
+        # writes the cleaned layout SVG back to disk at that point.
         ifcopenshell.api.document.remove_reference(tool.Ifc.get(), reference=reference)
 
         tool.Drawing.import_sheets()

src/bonsai/bonsai/tool/geometry.py

@@ -1407,6 +1407,8 @@ class Geometry(bonsai.core.tool.Geometry):
         :param representation_item: item to remove.
         :param element: item's element. Is used to unmark manual booleans.
         """
+        # NOTE: we assume it's not the last representation item
+        # otherwise we probably would need to remove representation too
         # NOTE: a lot of shared code with `geometry.remove_representation`
         ifc_file = tool.Ifc.get()
         shape_aspects: list[ifcopenshell.entity_instance] = []
@@ -1465,10 +1467,7 @@ class Geometry(bonsai.core.tool.Geometry):
             cls.remove_representation_items_from_shape_aspect([representation_item], shape_aspect)
 
         if representation:
-            new_items = tuple(set(representation.Items) - {representation_item})
-            if not new_items:
-                return
-            representation.Items = new_items
+            representation.Items = tuple(set(representation.Items) - {representation_item})
         also_consider = list(consider_inverses)
         ifcopenshell.util.element.remove_deep2(ifc_file, representation_item, also_consider=also_consider)
 

src/bonsai/bonsai/tool/ifc.py

@@ -197,16 +197,12 @@ class Ifc(bonsai.core.tool.Ifc):
         if not cls.get():
             return
 
-        # Clear all per-object msgbus subscriptions at once using the dedicated
-        # owner.  After undo/redo, per-object Python wrappers have new
-        # identities so clearing by individual obj would miss stale
-        # subscriptions registered with the old wrappers.
-        bpy.msgbus.clear_by_owner(bonsai.bim.handler.object_subscription_owner)
-
         for obj in bpy.data.objects:
             if obj.library:
                 continue
 
+            bpy.msgbus.clear_by_owner(obj)
+
             element = cls.get_entity(obj)
             if not element:
                 continue
@@ -221,6 +217,8 @@ class Ifc(bonsai.core.tool.Ifc):
             if obj.library:
                 continue
 
+            bpy.msgbus.clear_by_owner(obj)
+
             style = cls.get_entity(obj)
             if not style:
                 continue

src/bonsai/bonsai/tool/ifcgit.py

@@ -284,7 +284,7 @@ class IfcGit:
             if re.match("^Ifc", obj.name):
                 bpy.data.objects.remove(obj, do_unlink=True)
 
-        bpy.data.orphans_purge(do_recursive=True)  # ty:ignore[unknown-argument]
+        bpy.data.orphans_purge(do_recursive=True)
 
         settings = import_ifc.IfcImportSettings.factory(bpy.context, path_ifc, logging.getLogger("ImportIFC"))
         settings.should_setup_viewport_camera = False

src/bonsai/bonsai/tool/nest.py

@@ -45,23 +45,9 @@ class Nest(bonsai.core.tool.Nest):
         related_object = tool.Ifc.get_entity(related_obj)
         if not relating_object or not related_object:
             return False
-        if relating_object == related_object:
-            return False
-        is_compatible_class = relating_object.is_a("IfcElement") and related_object.is_a("IfcElement")
-        if not is_compatible_class:
-            return False
-        # Prevent cyclic references: walk up the full hierarchy from the
-        # proposed parent and reject if we encounter the proposed child.
-        ancestor = ifcopenshell.util.element.get_parent(relating_object)
-        seen = {relating_object}
-        while ancestor:
-            if ancestor == related_object:
-                return False
-            if ancestor in seen:
-                break
-            seen.add(ancestor)
-            ancestor = ifcopenshell.util.element.get_parent(ancestor)
-        return True
+        if relating_object.is_a("IfcElement") and related_object.is_a("IfcElement"):
+            return True
+        return False
 
     @classmethod
     def disable_editing(cls, obj: bpy.types.Object) -> None:

src/bonsai/bonsai/tool/spatial.py

@@ -21,13 +21,13 @@ from __future__ import annotations
 import json
 from collections import defaultdict
 from collections.abc import Generator, Iterable
+from math import pi
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 
 import bmesh
 import bpy
 import ifcopenshell
 import ifcopenshell.api.attribute
-import ifcopenshell.api.geometry
 import ifcopenshell.api.type
 import ifcopenshell.geom
 import ifcopenshell.util.classification
@@ -991,107 +991,114 @@ class Spatial(bonsai.core.tool.Spatial):
         return poly
 
     @classmethod
-    def create_object(cls, name: str) -> bpy.types.Object:
-        mesh = bpy.data.meshes.new(name=name)
+    def get_bmesh_from_polygon(cls, poly: Polygon, h: float, polygon_is_si: bool = False) -> bmesh.types.BMesh:
+        """
+        :param h: Height, in meters.
+        :param polygon_is_si: Should be True if `poly` is defined in meters.
+        """
+        mat = Matrix()
+        bm = bmesh.new()
+        bm.verts.index_update()
+        bm.edges.index_update()
+
+        mat_invert = mat.inverted()
+        si_conversion = 1.0 if polygon_is_si else ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        new_verts = [
+            # bm.verts.new(mat_invert @ (Vector([v[0], v[1], 0]) * si_conversion)) for v in poly.exterior.coords[0:-1]
+            bm.verts.new(mat_invert @ (Vector([v[0], v[1], 0]) * si_conversion))
+            for v in shapely.get_exterior_ring(poly).coords[0:-1]
+        ]
+        [bm.edges.new((new_verts[i], new_verts[i + 1])) for i in range(len(new_verts) - 1)]
+        bm.edges.new((new_verts[len(new_verts) - 1], new_verts[0]))
+
+        bm.verts.index_update()
+        bm.edges.index_update()
+
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=1e-5)
+        bmesh.ops.triangle_fill(bm, edges=bm.edges)
+        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 5, verts=bm.verts, edges=bm.edges)
+
+        if h != 0:
+            extrusion = bmesh.ops.extrude_face_region(bm, geom=bm.faces)
+            extruded_verts = [g for g in extrusion["geom"] if isinstance(g, bmesh.types.BMVert)]
+            bmesh.ops.translate(bm, vec=[0.0, 0.0, h], verts=extruded_verts)
+
+        bmesh.ops.recalc_face_normals(bm, faces=bm.faces)
+
+        return bm
+
+    @classmethod
+    def get_named_obj_from_bmesh(cls, name: str, bmesh: bmesh.types.BMesh) -> bpy.types.Object:
+        mesh = cls.get_named_mesh_from_bmesh(name, bmesh)
+        obj = cls.get_named_obj_from_mesh(name, mesh)
+        return obj
+
+    @classmethod
+    def get_named_obj_from_mesh(cls, name: str, mesh: bpy.types.Mesh) -> bpy.types.Object:
         obj = bpy.data.objects.new(name, mesh)
         return obj
 
     @classmethod
-    def set_obj_origin_to_polygon_center(
-        cls, obj: bpy.types.Object, poly: Polygon, polygon_is_si: bool = True
-    ) -> None:
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        centroid = poly.centroid
-        if polygon_is_si:
-            obj.location = Vector((centroid.x, centroid.y, 0))
-        else:
-            obj.location = Vector((centroid.x * unit_scale, centroid.y * unit_scale, 0))
-
+    def get_named_mesh_from_bmesh(cls, name: str, bmesh: bmesh.types.BMesh) -> bpy.types.Mesh:
+        mesh = bpy.data.meshes.new(name=name)
+        bmesh.to_mesh(mesh)
+        bmesh.free()
+        return mesh
 
     @classmethod
-    def get_2d_vertices_from_polygon(
-        cls,
-        poly: Polygon,
-        obj: bpy.types.Object,
-        polygon_is_si: bool = True,
-    ) -> list[list[float]]:
-        """Convert a world-space shapely polygon to 2D vertices in obj's local space, in IFC file units.
-
-        :param poly: The polygon in world space.
-        :param obj: The Blender object whose local space is used.
-        :param polygon_is_si: True if polygon coords are in SI, False if in IFC file units.
-        :return: List of [x, y] coordinates (not closed).
-        """
-        ifc_file = tool.Ifc.get()
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
-        bpy.context.view_layer.update()
-        mat_inv = obj.matrix_world.inverted()
-        coords_2d = []
-        for v in shapely.get_exterior_ring(poly).coords[:-1]:
-            world_si = Vector((v[0], v[1], 0))
-            if not polygon_is_si:
-                world_si = world_si * unit_scale
-            local_si = mat_inv @ world_si
-            coords_2d.append([local_si.x / unit_scale, local_si.y / unit_scale])
-        return coords_2d
+    def get_transformed_mesh_from_local_to_global(cls, mesh: bpy.types.Mesh) -> bpy.types.Mesh:
+        active_obj = cls.get_active_obj()
+        mat = active_obj.matrix_world
+        mesh.transform(mat.inverted())
+        mesh.update()
+        return mesh
 
     @classmethod
-    def set_extrusion_representation_from_polygon(
-        cls,
-        obj: bpy.types.Object,
-        element: ifcopenshell.entity_instance,
-        poly: Polygon,
-        depth_ifc: float,
-        polygon_is_si: bool = True,
-    ) -> None:
-        """Create or replace the IFC body representation from a polygon extrusion.
-
-        :param obj: The Blender object.
-        :param element: The IFC product entity.
-        :param poly: The polygon in world space.
-        :param depth_ifc: The extrusion depth in IFC file units.
-        :param polygon_is_si: True if polygon coords are in SI, False if in IFC file units.
-        """
-        ifc_file = tool.Ifc.get()
-        builder = ifcopenshell.util.shape_builder.ShapeBuilder(ifc_file)
-
-        coords_2d = cls.get_2d_vertices_from_polygon(poly, obj, polygon_is_si)
-
-        curve = builder.polyline(coords_2d, closed=True)
-        item = builder.extrude(curve, magnitude=depth_ifc)
-
-        old_body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-        if old_body:
-            context = old_body.ContextOfItems
-            ifcopenshell.api.geometry.unassign_representation(ifc_file, product=element, representation=old_body)
-            ifcopenshell.api.geometry.remove_representation(ifc_file, representation=old_body)
-        else:
-            context = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
-
-        new_body = builder.get_representation(context, item)
-        ifcopenshell.api.geometry.assign_representation(ifc_file, product=element, representation=new_body)
-        bonsai.core.geometry.switch_representation(
-            tool.Ifc,
-            tool.Geometry,
-            obj=obj,
-            representation=new_body,
-        )
+    def edit_active_space_obj_from_mesh(cls, mesh: bpy.types.Mesh) -> None:
+        active_obj = bpy.context.active_object
+        old_mesh = active_obj.data
+        old_mesh_name = old_mesh.name
+        assert active_obj and isinstance(old_mesh, bpy.types.Mesh)
+        tool.Geometry.get_mesh_props(mesh).ifc_definition_id = tool.Geometry.get_mesh_props(old_mesh).ifc_definition_id
+        tool.Geometry.change_object_data(active_obj, mesh, is_global=True)
+        tool.Ifc.edit(active_obj)
+        tool.Blender.remove_data_block(old_mesh)
+        # Rename after old mesh is removed to avoid .001 suffix.
+        mesh.name = old_mesh_name
 
     @classmethod
-    def set_space_representation_from_polygon(
-        cls,
-        obj: bpy.types.Object,
-        element: ifcopenshell.entity_instance,
-        poly: Polygon,
-        h: float,
-        polygon_is_si: bool = True,
-    ) -> None:
-        """Create or replace the IFC body representation of a space from a polygon.
+    def set_obj_origin_to_bboxcenter(cls, obj: bpy.types.Object) -> None:
+        mat = obj.matrix_world
+        inverted = mat.inverted()
+        local_bbox_center = 0.125 * sum((Vector(b) for b in obj.bound_box), Vector())
+        global_bbox_center = mat @ local_bbox_center
 
-        :param h: The height in SI (meters).
-        """
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        cls.set_extrusion_representation_from_polygon(obj, element, poly, h / unit_scale, polygon_is_si)
+        oldLoc = obj.location
+        newLoc = global_bbox_center
+        diff = newLoc - oldLoc
+        for vert in obj.data.vertices:
+            aux_vector = mat @ vert.co
+            aux_vector = aux_vector - diff
+            vert.co = inverted @ aux_vector
+        obj.location = newLoc
+
+    @classmethod
+    def set_obj_origin_to_bboxcenter_and_zero_elevation(cls, obj: bpy.types.Object) -> None:
+        mat = obj.matrix_world
+        inverted = mat.inverted()
+        local_bbox_center = 0.125 * sum((Vector(b) for b in obj.bound_box), Vector())
+        global_bbox_center = mat @ local_bbox_center
+        global_obj_origin = global_bbox_center
+        global_obj_origin.z = 0
+
+        oldLoc = obj.location
+        newLoc = global_obj_origin
+        diff = newLoc - oldLoc
+        for vert in obj.data.vertices:
+            aux_vector = mat @ vert.co
+            aux_vector = aux_vector - diff
+            vert.co = inverted @ aux_vector
+        obj.location = newLoc
 
     @classmethod
     def set_obj_origin_to_cursor_position_and_zero_elevation(cls, obj: bpy.types.Object) -> None:
@@ -1138,53 +1145,65 @@ class Spatial(bonsai.core.tool.Spatial):
         if z != 0:
             obj.location = obj.location + Vector((0, 0, z))
 
+    @classmethod
+    def get_2d_vertices_from_obj(cls, obj: bpy.types.Object) -> list[tuple]:
+        points = []
+        vectors = [v.co for v in obj.data.vertices.values()]
+        for vector in vectors:
+            points.append(vector.xy)
+
+        points.append(vectors[0].xy)
+        return points
+
+    @classmethod
+    def get_scaled_2d_vertices(cls, points: list[Vector]) -> list[tuple[float, float]]:
+        model = tool.Ifc.get()
+        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(model)
+        _points = []
+        for p in points:
+            _p = list(p)
+            _p[0] /= unit_scale
+            _p[1] /= unit_scale
+            _points.append(_p)
+        return _points
+
+    @classmethod
+    def assign_swept_area_outer_curve_from_2d_vertices(cls, obj: bpy.types.Object, vertices: list[Vector]) -> None:
+        body = cls.get_body_representation(obj)
+        model = tool.Ifc.get()
+        extrusion = tool.Model.get_extrusion(body)
+        area = extrusion.SweptArea
+        old_area = area.OuterCurve
+
+        builder = ifcopenshell.util.shape_builder.ShapeBuilder(model)
+        outer_curve = builder.polyline(vertices, closed=True)
+
+        area.OuterCurve = outer_curve
+        ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_area)
+
+    @classmethod
+    def get_body_representation(cls, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:
+        element = tool.Ifc.get_entity(obj)
+        return ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+
     @classmethod
     def assign_ifcspace_class_to_obj(cls, obj: bpy.types.Object) -> None:
-        bonsai.core.root.assign_class(
-            tool.Ifc,
-            tool.Collector,
-            tool.Root,
-            obj=obj,
-            ifc_class="IfcSpace",
-            should_add_representation=False,
-        )
+        bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcSpace")
 
     @classmethod
     def assign_type_to_obj(cls, obj: bpy.types.Object) -> None:
+        # TODO this code looks in the wrong spot and suspicious
         props = tool.Model.get_model_props()
         ifc_file = tool.Ifc.get()
         relating_type_id = props.relating_type_id
-        relating_type = ifc_file.by_id(int(relating_type_id))
+        relating_type = tool.Ifc.get().by_id(int(relating_type_id))
         ifc_class = relating_type.is_a()
         instance_class = ifcopenshell.util.type.get_applicable_entities(ifc_class, ifc_file.schema)[0]
-        bonsai.core.root.assign_class(
-            tool.Ifc,
-            tool.Collector,
-            tool.Root,
-            obj=obj,
-            ifc_class=instance_class,
-            should_add_representation=False,
-        )
+        bpy.ops.bim.assign_class(obj=obj.name, ifc_class=instance_class)
         element = tool.Ifc.get_entity(obj)
         assert element
         ifcopenshell.api.type.assign_type(ifc_file, related_objects=[element], relating_type=relating_type)
 
-    @classmethod
-    def set_covering_representation_from_polygon(
-        cls,
-        obj: bpy.types.Object,
-        poly: Polygon,
-        polygon_is_si: bool = True,
-    ) -> None:
-        """Create the covering body representation from a polygon, extruded by the type's material layer thickness."""
-        element = tool.Ifc.get_entity(obj)
-        relating_type = ifcopenshell.util.element.get_type(element)
-        material = ifcopenshell.util.element.get_material(relating_type, should_skip_usage=True)
-        depth = 0.0
-        if material and material.is_a("IfcMaterialLayerSet"):
-            depth = sum(layer.LayerThickness for layer in material.MaterialLayers)
-        cls.set_extrusion_representation_from_polygon(obj, element, poly, depth, polygon_is_si)
-
     @classmethod
     def assign_relating_type_to_element(
         cls,
@@ -1195,6 +1214,14 @@ class Spatial(bonsai.core.tool.Spatial):
     ) -> None:
         bonsai.core.type.assign_type(ifc, tool.Model, type, element=element, type=relating_type)
 
+    @classmethod
+    def regen_obj_representation(cls, obj: bpy.types.Object, body: ifcopenshell.entity_instance) -> None:
+        bonsai.core.geometry.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=body,
+        )
 
     @classmethod
     def set_space_visibility(cls, is_visible: bool) -> None:

src/bonsai/docs/guides/development/index.rst

@@ -19,5 +19,4 @@ This chapter covers how you can help contribute to Bonsai.
       undo_system
       writing_docs
       debugging
-      maintenance
       ide/index

src/bonsai/docs/guides/development/maintenance.rst

@@ -1,65 +0,0 @@
-Maintenance
-===========
-
-This page documents what needs to be updated in various maintenance scenarios.
-
-Python Version Added or Removed
---------------------------------
-
-When adding or removing a supported Python version, update the following:
-
-.. list-table::
-   :header-rows: 1
-
-   * - File
-     - What to update
-   * - ``.github/workflows/ci-black-formatting.yaml``
-     - ``MIN_IOS_PY_VERSION``
-   * - ``.github/workflows/ci-ifcopenshell-python-pypi.yml``
-     - ``pyver`` matrix
-   * - ``.github/workflows/ci-ifcopenshell-python.yml``
-     - ``pyver`` matrix
-   * - ``nix/build-all.py``
-     - ``PYTHON_VERSIONS`` list
-   * - ``src/bsdd/pyproject.toml``
-     - ``requires-python``
-   * - ``src/ifcopenshell-python/docs/ifcopenshell-python/installation.rst``
-     - add or remove the row in the ZIP packages table
-   * - ``src/ifcopenshell-python/Makefile``
-     - ``SUPPORTED_PYVERSIONS``
-   * - ``src/ifcopenshell-python/pyproject.toml``
-     - ``requires-python``
-   * - ``src/ifcopenshell-python/test/test_package.py``
-     - ``SUPPORTED_PY_VERSIONS`` tuple
-   * - ``win/build-all-win.py``
-     - ``PYTHON_VERSIONS`` list
-
-Blender Version Updated
------------------------
-
-When a new Blender version is released and supported:
-
-.. list-table::
-   :header-rows: 1
-
-   * - File
-     - What to update
-   * - ``.github/workflows/ci-bonsai-daily.yml``
-     - Blender download URL
-
-Blender's Bundled Python Version Updated
------------------------------------------
-
-When Blender ships with a new Python version:
-
-.. list-table::
-   :header-rows: 1
-
-   * - File
-     - What to update
-   * - ``.github/workflows/ci-black-formatting.yaml``
-     - ``MIN_BLENDER_PY_VERSION``
-   * - ``src/bonsai/Makefile``
-     - ``SUPPORTED_PYVERSIONS``
-   * - ``src/bonsai/scripts/dev_environment.py``
-     - ``PYTHON_VERSION`` mapping (Blender version, bundled Python version)

src/bonsai/scripts/bonsai_deps.py

@@ -1,23 +0,0 @@
-"""Clone or update Bonsai external dependencies.
-
-Must be run from the repository root.
-"""
-
-import subprocess
-from pathlib import Path
-
-DEPS = [
-    ("https://projects.blender.org/pioverfour/sun_position.git", "sun_position"),
-    ("https://github.com/kevancress/MeasureIt_ARCH", "MeasureIt_ARCH"),
-    ("https://github.com/nortikin/sverchok.git", "sverchok"),
-]
-
-base = Path("src/bonsai/external_dependencies")
-base.mkdir(parents=True, exist_ok=True)
-
-for url, name in DEPS:
-    path = base / name
-    if not path.exists():
-        subprocess.check_call(["git", "clone", url, str(path)])
-    else:
-        subprocess.check_call(["git", "-C", str(path), "pull", "--rebase"])

src/bonsai/scripts/bonsai_translations.py

@@ -273,10 +273,10 @@ if BPY_IS_LOADED:
                     f"Couldn't find locale path in the source directory, creating dummy directory: {source_locale_path}.",
                 )
 
-            from ui_translate.settings import (  # pyright: ignore[reportMissingImports]  # ty:ignore[unresolved-import]
+            from ui_translate.settings import (  # pyright: ignore[reportMissingImports]
                 settings as ui_translate_settings,
             )
-            from ui_translate.update_ui import (  # pyright: ignore[reportMissingImports]  # ty:ignore[unresolved-import]
+            from ui_translate.update_ui import (  # pyright: ignore[reportMissingImports]
                 UI_OT_i18n_updatetranslation_init_settings,
             )
 

src/bonsai/scripts/gbxml.py

@@ -23,9 +23,7 @@ import bpy
 
 # sys.path.append('C:\Program Files\Python37\Lib\site-packages')
 import lxml.etree
-from bspy import (  # ty: ignore[unresolved-import]
-    Gbxml,  # pyright: ignore[reportMissingImports]
-)
+from bspy import Gbxml  # pyright: ignore[reportMissingImports]
 
 
 class GbxmlExporter:

src/bonsai/scripts/generate_steel_profiles_library.py

@@ -22,7 +22,7 @@
 from math import pi
 from pathlib import Path
 
-import boltspy as bolts  # pyright: ignore[reportMissingImports]  # ty:ignore[unresolved-import]
+import boltspy as bolts  # pyright: ignore[reportMissingImports]
 import ifcopenshell.api
 import ifcopenshell.api.material
 import ifcopenshell.api.project

src/bonsai/scripts/obj2ifc-meshlab.py

@@ -31,7 +31,7 @@ import ifcopenshell.api.spatial
 import ifcopenshell.api.unit
 import ifcopenshell.guid
 import numpy as np
-import pymeshlab  # pyright: ignore[reportMissingImports]  # ty:ignore[unresolved-import]
+import pymeshlab  # pyright: ignore[reportMissingImports]
 
 
 class Obj2Ifc:

src/bonsai/scripts/obj2ifc.py

@@ -31,7 +31,7 @@ import ifcopenshell.api.spatial
 import ifcopenshell.api.unit
 import ifcopenshell.guid
 import numpy as np
-import pywavefront  # pyright: ignore[reportMissingImports]  # ty:ignore[unresolved-import]
+import pywavefront  # pyright: ignore[reportMissingImports]
 
 
 class Obj2Ifc:

src/bonsai/test/bim/feature/covering.feature

@@ -2,7 +2,7 @@
 Feature: Covering
     Covers covering tool.
 
-Scenario: Add flooring from walls
+Scenario: Execute generate flooring coverings from walls
     Given an empty IFC project
     And I load the demo construction library
     And I set "scene.BIMModelProperties.ifc_class" to "IfcWallType"
@@ -24,9 +24,9 @@ Scenario: Add flooring from walls
     And the cursor is at "0,2.0,0"
     And I set "scene.BIMModelProperties.length" to "1.9"
     And I press "bim.add_occurrence"
-    # Set COV30 predefined type to FLOORING.
+    # add_instance_flooring_coverings_from_walls is expecting FLOORING predefined type.
     And the object "IfcCoveringType/COV30" is selected
-    And I look at the "Object Attributes" panel
+    And I look at the "Attributes" panel
     And I click "Edit"
     And I set the "PredefinedType" property to "FLOORING"
     And I click "Save Attributes"
@@ -42,108 +42,3 @@ Scenario: Add flooring from walls
     Then the object "IfcCovering/Covering0" exists
     And the object "IfcCovering/Covering0" is at "1.8,1.05,0.0"
     And the object "IfcCovering/Covering0" dimensions are "3.4,1.9,0.03"
-
-Scenario: Add ceiling from walls
-    Given an empty IFC project
-    And I load the demo construction library
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcWallType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcWallType') if e.Name == 'WAL100'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_occurrence"
-    And the object "IfcWall/Wall" is selected
-    And I press "bim.change_layer_length(length=3.6)"
-    And the cursor is at "3.6,0.1,3"
-    And I set "scene.BIMModelProperties.length" to "2.0"
-    And I press "bim.add_occurrence"
-    And the cursor is at "3.5,2.1,3"
-    And I set "scene.BIMModelProperties.length" to "3.5"
-    And I press "bim.add_occurrence"
-    And the cursor is at "0,2.0,0"
-    And I set "scene.BIMModelProperties.length" to "1.9"
-    And I press "bim.add_occurrence"
-    # Set COV30 predefined type to CEILING.
-    And the object "IfcCoveringType/COV30" is selected
-    And I look at the "Object Attributes" panel
-    And I click "Edit"
-    And I set the "PredefinedType" property to "CEILING"
-    And I click "Save Attributes"
-    # Run the operator with ceiling height = 2.7 (default).
-    When the object "IfcWall/Wall" is selected
-    And additionally the object "IfcWall/Wall.001" is selected
-    And additionally the object "IfcWall/Wall.002" is selected
-    And additionally the object "IfcWall/Wall.003" is selected
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcCoveringType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcCoveringType') if e.Name == 'COV30'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_instance_ceiling_coverings_from_walls"
-    Then the object "IfcCovering/Covering0" exists
-    And the object "IfcCovering/Covering0" is at "1.8,1.05,2.7"
-    And the object "IfcCovering/Covering0" dimensions are "3.4,1.9,0.03"
-
-Scenario: Add flooring from cursor
-    Given an empty IFC project
-    And I load the demo construction library
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcWallType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcWallType') if e.Name == 'WAL100'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_occurrence"
-    And the cursor is at "1.1,0,0"
-    And I press "bim.add_occurrence"
-    And the object "IfcWall/Wall.001" is selected
-    And I press "bim.hotkey(hotkey='S_R')"
-    And the cursor is at "0,.9,0"
-    And I press "bim.add_occurrence"
-    And the cursor is at "-1,0,0"
-    And I press "bim.add_occurrence"
-    And the object "IfcWall/Wall.003" is selected
-    And I press "bim.hotkey(hotkey='S_R')"
-    And the object "IfcWall/Wall.003" is moved to "0,0,0"
-    # Set COV30 predefined type to FLOORING.
-    And the object "IfcCoveringType/COV30" is selected
-    And I look at the "Object Attributes" panel
-    And I click "Edit"
-    And I set the "PredefinedType" property to "FLOORING"
-    And I click "Save Attributes"
-    # Generate covering from cursor inside the room.
-    When the cursor is at "0.5,0.5,0"
-    And I deselect all objects
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcCoveringType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcCoveringType') if e.Name == 'COV30'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_instance_flooring_covering_from_cursor"
-    Then the object "IfcCovering/Covering" exists
-    And the object "IfcCovering/Covering" dimensions are "1,0.8,0.03"
-
-Scenario: Add ceiling from cursor
-    Given an empty IFC project
-    And I load the demo construction library
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcWallType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcWallType') if e.Name == 'WAL100'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_occurrence"
-    And the cursor is at "1.1,0,0"
-    And I press "bim.add_occurrence"
-    And the object "IfcWall/Wall.001" is selected
-    And I press "bim.hotkey(hotkey='S_R')"
-    And the cursor is at "0,.9,0"
-    And I press "bim.add_occurrence"
-    And the cursor is at "-1,0,0"
-    And I press "bim.add_occurrence"
-    And the object "IfcWall/Wall.003" is selected
-    And I press "bim.hotkey(hotkey='S_R')"
-    And the object "IfcWall/Wall.003" is moved to "0,0,0"
-    # Set COV30 predefined type to CEILING.
-    And the object "IfcCoveringType/COV30" is selected
-    And I look at the "Object Attributes" panel
-    And I click "Edit"
-    And I set the "PredefinedType" property to "CEILING"
-    And I click "Save Attributes"
-    # Generate covering from cursor inside the room.
-    When the cursor is at "0.5,0.5,0"
-    And I deselect all objects
-    And I set "scene.BIMModelProperties.ifc_class" to "IfcCoveringType"
-    And the variable "element_type" is "[e for e in {ifc}.by_type('IfcCoveringType') if e.Name == 'COV30'][0].id()"
-    And I set "scene.BIMModelProperties.relating_type_id" to "{element_type}"
-    And I press "bim.add_instance_ceiling_covering_from_cursor"
-    Then the object "IfcCovering/Covering" exists
-    And the object "IfcCovering/Covering" dimensions are "1,0.8,0.03"

src/bonsai/test/bim/feature/material.feature

@@ -422,24 +422,6 @@ Scenario: Enable editing material set item
     When I press "bim.enable_editing_material_set_item(material_set_item={material_profile})"
     Then nothing happens
 
-Scenario: Edit layer item defaults null IsVentilated to FALSE in UI
-    Given an empty IFC project
-    And I add a cube
-    And the object "Cube" is selected
-    And I look at the "Class" panel
-    And I set the "Products" property to "IfcElement"
-    And I set the "Class" property to "IfcWall"
-    And I click "Assign IFC Class"
-    And I press "bim.add_material()"
-    And I set "active_object.BIMObjectMaterialProperties.material_type" to "IfcMaterialLayerSet"
-    And I press "bim.assign_material"
-    And I press "bim.enable_editing_assigned_material"
-    And the variable "layer" is "{ifc}.by_type('IfcMaterialLayer')[0].id()"
-    And I press "bim.enable_editing_material_set_item(material_set_item={layer})"
-    When I evaluate expression "attrs = bpy.context.active_object.BIMObjectMaterialProperties.material_set_item_attributes; is_vent = next(a for a in attrs if a.name == 'IsVentilated'); assert is_vent.enum_value == 'FALSE'; assert is_vent.is_null is True"
-    And I press "bim.edit_material_set_item(material_set_item={layer})"
-    Then I evaluate expression "assert {ifc}.by_id({layer}).IsVentilated is None"
-
 Scenario: Add material set layer
     Given an empty IFC project
     And I add a cube

src/bonsai/test/bim/test_feature.py

@@ -242,7 +242,7 @@ class TemplateListItemSpy(PanelSpy):
         self.spied_props: list[dict[str, Any]] = []
         self.spied_operators: list[dict[str, Any]] = []
         if len(signature(blender_panel.draw_item).parameters) == 8:
-            blender_panel.draw_item(  # ty:ignore[missing-argument]
+            blender_panel.draw_item(
                 self,
                 bpy.context,
                 self,

src/bonsai/test/core/test_drawing.py

@@ -35,14 +35,9 @@ class TestDisableEditingText:
 
 class TestEditText:
     def test_run(self, drawing):
-        drawing.export_text_literal_attributes("obj").should_be_called().will_return("literal_attributes")
-        drawing.export_font_size("obj").should_be_called().will_return("font_size")
-        drawing.edit_text_font_size("obj", "font_size").should_be_called()
-        drawing.export_wrap_length("obj").should_be_called().will_return("wrap_length")
-        drawing.edit_text_wrap_length("obj", "wrap_length").should_be_called()
-        drawing.export_symbol("obj").should_be_called().will_return("symbol")
-        drawing.edit_text_symbol("obj", "symbol").should_be_called()
-        drawing.edit_text_literals("obj", "literal_attributes").should_be_called()
+        drawing.synchronise_ifc_and_text_attributes("obj").should_be_called()
+        drawing.update_text_size_pset("obj").should_be_called()
+        drawing.update_text_annotation_properties("obj").should_be_called()
         drawing.disable_editing_text("obj").should_be_called()
         subject.edit_text(drawing, obj="obj")
 
@@ -471,7 +466,6 @@ class TestRemoveDrawing:
 class TestUpdateDrawingName:
     def test_do_not_update_if_name_unchanged(self, ifc, drawing):
         drawing.get_name("drawing").should_be_called().will_return("name")
-        drawing.set_camera_name("drawing", "name").should_be_called()
         drawing.get_drawing_group("drawing").should_be_called().will_return("group")
         drawing.get_name("group").should_be_called().will_return("name")
         drawing.get_drawing_collection("drawing").should_be_called().will_return("collection")
@@ -488,7 +482,6 @@ class TestUpdateDrawingName:
     def test_run(self, ifc, drawing):
         drawing.get_name("drawing").should_be_called().will_return("oldname")
         ifc.run("attribute.edit_attributes", product="drawing", attributes={"Name": "name"}).should_be_called()
-        drawing.set_camera_name("drawing", "name").should_be_called()
         drawing.get_drawing_group("drawing").should_be_called().will_return("group")
         drawing.get_name("group").should_be_called().will_return("oldname")
         ifc.run("attribute.edit_attributes", product="group", attributes={"Name": "name"}).should_be_called()

src/bonsai/test/core/test_georeference.py

@@ -23,7 +23,6 @@ from test.core.bootstrap import georeference, ifc
 class TestAddGeoreferencing:
     def test_run(self, georeference):
         georeference.add_georeferencing().should_be_called()
-        georeference.set_model_origin().should_be_called()
         subject.add_georeferencing(georeference)
 
 
@@ -36,10 +35,9 @@ class TestEnableEditingGeoreferencing:
 
 
 class TestRemoveGeoreferencing:
-    def test_run(self, ifc, georeference):
+    def test_run(self, ifc):
         ifc.run("georeference.remove_georeferencing").should_be_called()
-        georeference.set_model_origin().should_be_called()
-        subject.remove_georeferencing(ifc, georeference)
+        subject.remove_georeferencing(ifc)
 
 
 class TestDisableEditingGeoreferencing:

src/bonsai/test/core/test_type.py

@@ -22,9 +22,8 @@ from test.core.bootstrap import geometry, ifc, model, type
 
 class TestAssignType:
     def test_assigning_and_switching_to_an_existing_type_data(self, ifc, model, type):
-        type.record_material_usage_attributes("element").should_be_called().will_return(None)
         ifc.run("type.assign_type", related_objects=["element"], relating_type="type").should_be_called()
-        model.get_usage_type("type").should_be_called(2).will_return(None)
+        type.has_material_usage("element").should_be_called().will_return(False)
         ifc.get_object("type").should_be_called().will_return("type_obj")
         type.get_object_data("type_obj").should_be_called().will_return("type_obj_data")
         type.change_object_data("obj", "type_obj_data", is_global=False).should_be_called()
@@ -32,10 +31,9 @@ class TestAssignType:
         type.disable_editing("obj").should_be_called()
         subject.assign_type(ifc, model, type, element="element", type="type")
 
-    def test_assigning_and_not_changing_data_if_the_type_has_no_data(self, ifc, model, type):
-        type.record_material_usage_attributes("element").should_be_called().will_return(None)
+    def test_assigning_and_not_changing_data_if_the_type_has_no_data(self, ifc, type):
         ifc.run("type.assign_type", related_objects=["element"], relating_type="type").should_be_called()
-        model.get_usage_type("type").should_be_called(2).will_return(None)
+        type.has_material_usage("element").should_be_called().will_return(False)
         ifc.get_object("type").should_be_called().will_return("type_obj")
         type.get_object_data("type_obj").should_be_called().will_return(None)
         ifc.get_object("element").should_be_called().will_return("obj")

src/bonsai/test/tool/test_aggregate.py

@@ -18,7 +18,6 @@
 
 import bpy
 import ifcopenshell
-import ifcopenshell.api.aggregate
 import ifcopenshell.api.context
 import ifcopenshell.api.geometry
 import ifcopenshell.api.root
@@ -100,42 +99,6 @@ class TestCanAggregate(NewFile):
         subelement_obj = bpy.data.objects.new("Object", None)
         assert subject.can_aggregate(element_obj, subelement_obj) is False
 
-    def test_element_cannot_aggregate_to_itself(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        element = ifc.createIfcElementAssembly()
-        element_obj = bpy.data.objects.new("Object", None)
-        tool.Ifc.link(element, element_obj)
-        assert subject.can_aggregate(element_obj, element_obj) is False
-
-    def test_cyclic_aggregation_is_prevented(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        assembly_a = ifc.createIfcElementAssembly()
-        assembly_a_obj = bpy.data.objects.new("AssemblyA", None)
-        tool.Ifc.link(assembly_a, assembly_a_obj)
-        beam = ifc.createIfcBeam()
-        beam_obj = bpy.data.objects.new("Beam", None)
-        tool.Ifc.link(beam, beam_obj)
-        ifcopenshell.api.aggregate.assign_object(ifc, products=[beam], relating_object=assembly_a)
-        assert subject.can_aggregate(beam_obj, assembly_a_obj) is False
-
-    def test_deep_cyclic_aggregation_is_prevented(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        assembly_a = ifc.createIfcElementAssembly()
-        assembly_a_obj = bpy.data.objects.new("AssemblyA", None)
-        tool.Ifc.link(assembly_a, assembly_a_obj)
-        assembly_b = ifc.createIfcElementAssembly()
-        assembly_b_obj = bpy.data.objects.new("AssemblyB", None)
-        tool.Ifc.link(assembly_b, assembly_b_obj)
-        beam = ifc.createIfcBeam()
-        beam_obj = bpy.data.objects.new("Beam", None)
-        tool.Ifc.link(beam, beam_obj)
-        ifcopenshell.api.aggregate.assign_object(ifc, products=[assembly_b], relating_object=assembly_a)
-        ifcopenshell.api.aggregate.assign_object(ifc, products=[beam], relating_object=assembly_b)
-        assert subject.can_aggregate(beam_obj, assembly_a_obj) is False
-
 
 class TestHasPhysicalBodyRepresentation(NewFile):
     def test_run(self):

src/bonsai/test/tool/test_model.py

@@ -176,7 +176,6 @@ class TestStairCalculatedParams(NewFile):
         pset_data = pset_data_base.copy()
         calculated_data = calculated_data_base.copy()
         pset_data["custom_first_last_tread_run"] = (0.1, 0.4)
-        pset_data["custom_tread_lock"] = False
         calculated_data["Length"] += -0.2 + 0.1
         self.compare_data(pset_data, calculated_data)
 
@@ -184,7 +183,6 @@ class TestStairCalculatedParams(NewFile):
         pset_data = pset_data_base.copy()
         calculated_data = calculated_data_base.copy()
         pset_data["custom_first_last_tread_run"] = (0.0, None)
-        pset_data["custom_tread_lock"] = False
         calculated_data["Length"] = 0.9  # Only 3 treads at 0.3 each
         self.compare_data(pset_data, calculated_data)
 
@@ -192,7 +190,6 @@ class TestStairCalculatedParams(NewFile):
         pset_data = pset_data_base.copy()
         calculated_data = calculated_data_base.copy()
         pset_data["custom_first_last_tread_run"] = (None, 0.0)
-        pset_data["custom_tread_lock"] = False
         calculated_data["Length"] = 0.9  # Only 3 treads at 0.3 each
         self.compare_data(pset_data, calculated_data)
 
@@ -200,7 +197,6 @@ class TestStairCalculatedParams(NewFile):
         pset_data = pset_data_base.copy()
         calculated_data = calculated_data_base.copy()
         pset_data["custom_first_last_tread_run"] = (0.0, 0.0)
-        pset_data["custom_tread_lock"] = False
         calculated_data["Length"] = 0.6  # Only 2 middle treads at 0.3 each
         self.compare_data(pset_data, calculated_data)
 

src/bonsai/test/tool/test_nest.py

@@ -19,7 +19,6 @@
 import bpy
 import ifcopenshell
 import ifcopenshell.api
-import ifcopenshell.api.nest
 import ifcopenshell.api.spatial
 
 import bonsai.core.tool
@@ -52,42 +51,6 @@ class TestCanNest(NewFile):
         subelement_obj = bpy.data.objects.new("Object", None)
         assert subject.can_nest(element_obj, subelement_obj) is False
 
-    def test_element_cannot_nest_to_itself(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        element = ifc.createIfcWall()
-        element_obj = bpy.data.objects.new("Object", None)
-        tool.Ifc.link(element, element_obj)
-        assert subject.can_nest(element_obj, element_obj) is False
-
-    def test_cyclic_nesting_is_prevented(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        wall_a = ifc.createIfcWall()
-        wall_a_obj = bpy.data.objects.new("WallA", None)
-        tool.Ifc.link(wall_a, wall_a_obj)
-        wall_b = ifc.createIfcWall()
-        wall_b_obj = bpy.data.objects.new("WallB", None)
-        tool.Ifc.link(wall_b, wall_b_obj)
-        ifcopenshell.api.nest.assign_object(ifc, related_objects=[wall_b], relating_object=wall_a)
-        assert subject.can_nest(wall_b_obj, wall_a_obj) is False
-
-    def test_deep_cyclic_nesting_is_prevented(self):
-        ifc = ifcopenshell.file()
-        tool.Ifc.set(ifc)
-        wall_a = ifc.createIfcWall()
-        wall_a_obj = bpy.data.objects.new("WallA", None)
-        tool.Ifc.link(wall_a, wall_a_obj)
-        wall_b = ifc.createIfcWall()
-        wall_b_obj = bpy.data.objects.new("WallB", None)
-        tool.Ifc.link(wall_b, wall_b_obj)
-        wall_c = ifc.createIfcWall()
-        wall_c_obj = bpy.data.objects.new("WallC", None)
-        tool.Ifc.link(wall_c, wall_c_obj)
-        ifcopenshell.api.nest.assign_object(ifc, related_objects=[wall_b], relating_object=wall_a)
-        ifcopenshell.api.nest.assign_object(ifc, related_objects=[wall_c], relating_object=wall_b)
-        assert subject.can_nest(wall_c_obj, wall_a_obj) is False
-
 
 class TestDisableEditing(NewFile):
     def test_run(self):

src/bonsai/test/tool/test_project.py

@@ -365,7 +365,7 @@ class TestLoadingIfcSqlite(NewFile):
             sql_type="SQLite",
         )
         patcher.patch()
-        tmp_file = Path(tempfile.mkstemp(suffix=".ifcsqlite")[1])
+        tmp_file = Path(tempfile.mktemp(suffix=".ifcsqlite"))
         ifcpatch.write(patcher.get_output(), tmp_file)
 
         elements_with_meshes = [

src/bonsai/type-check-requirements.txt

@@ -1,41 +0,0 @@
-aiohttp
-beautifulsoup4
-boto3
-botocore
-brickschema
-cjio >=0.8, <0.10
-debugpy
-ezdxf
-fake-bpy-module-latest
-git+https://github.com/prochitecture/bpypolyskel
-git+https://github.com/Andrej730/IFC2JSON_python.git@pyproject_toml
-gitpython
-isodate
-lark
-lxml
-lxml-stubs
-markdown-it-py
-natsort
-numpy
-odfpy
-openpyxl
-pandas
-pillow
-platformdirs
-pygments
-pyradiance
-pystache
-pytest
-pytest_bdd
-pytest_blender
-python-dateutil
-python-socketio
-pytz
-rdflib
-requests
-shapely
-svgwrite
-typing-extensions
-typst
-tzfpy
-xsdata

src/bsdd/bsdd_json.py

@@ -7,7 +7,7 @@ from typing import Literal, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, model_validator
 
-from type_hints import *
+from .type_hints import *
 
 
 def _lower_first(s: str) -> str:

src/common.mk

@@ -28,7 +28,6 @@ dist:
 	mkdir -p dist
 	cp -r $(PACKAGE_NAME) build/
 	cp pyproject.toml build/
-	if [ -f README.md ]; then cp README.md build/; fi
 ifeq ($(IS_STABLE), TRUE)
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
 ifdef IS_MODULE

src/ifcfm/ifcfm/cobie24.py

@@ -955,7 +955,7 @@ def get_unit_type_name(ifc_file: ifcopenshell.file, unit_type: str) -> Union[str
             return val(unit.Currency)
 
 
-def get_unit_name(unit: ifcopenshell.entity_instance) -> Union[str, None]:
+def get_unit_name(ifc_file: ifcopenshell.entity_instance, unit: ifcopenshell.entity_instance) -> Union[str, None]:
     if unit.is_a("IfcNamedUnit"):
         return val(unit.Name)
 

src/ifcfm/ifcfm/cobie24legacy.py

@@ -953,7 +953,7 @@ def get_unit_type_name(ifc_file: ifcopenshell.file, unit_type: str) -> Union[str
             return val(unit.Currency)
 
 
-def get_unit_name(unit: ifcopenshell.entity_instance) -> Union[str, None]:
+def get_unit_name(ifc_file: ifcopenshell.entity_instance, unit: ifcopenshell.entity_instance) -> Union[str, None]:
     if unit.is_a("IfcNamedUnit"):
         return val(unit.Name)
 

src/ifcgeom/mapping/IfcAxis2PlacementLinear.cpp

@@ -29,10 +29,8 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAxis2PlacementLinear* inst)
         Logger::Error(std::runtime_error("Location must be IfcPointByDistanceExpression for IfcAxis2PlacementLinear"));
     }
 
-    Eigen::Vector3d o, axis(0, 0, 1), refDirection;
-
     taxonomy::matrix4::ptr m = taxonomy::cast<taxonomy::matrix4>(map(inst->Location()));
-    o = m->components().col(3).head<3>();
+    Eigen::Vector3d o = m->components().col(3).head<3>();
 
     // From 8.9.3.4 IfcAxis2PlacementLinear there are 4 cases that need to be considered
     // 1) Axis is given but not RefDirection
@@ -40,43 +38,12 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAxis2PlacementLinear* inst)
     // 3) Neither Axis or RefDirection are provided
     // 4) Both Axis and RefDirection are provided
 
-    const bool hasAxis = inst->Axis() != nullptr;
-    const bool hasRef = inst->RefDirection() != nullptr;
+    Eigen::Vector3d z = inst->Axis() ? *taxonomy::cast<taxonomy::direction3>(map(inst->Axis()))->components_ : Eigen::Vector3d(0,0,1); // Axis is (0,0,1) when omitted
+    Eigen::Vector3d rd = inst->RefDirection() ? *taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()))->components_ : m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
+    Eigen::Vector3d y = z.cross(rd);
+    Eigen::Vector3d x = y.cross(z);
 
-    /*
-    if (hasAxis != hasRef) {
-		Logger::Warning("Axis and RefDirection should be specified together", inst);
-	}
-	*/
-
-    if (hasAxis && !hasRef) {
-        taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
-        axis = *a->components_;
-
-        refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
-        // refDirection is not necessarily orthogonal to axis.
-        // axis.cross(refDirection) gives y. y.cross(axis) gives x=refDirection
-        refDirection = axis.cross(refDirection).cross(axis);
-    } else if (!hasAxis && hasRef) {
-        taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
-        refDirection = *r->components_;
-        Eigen::Vector3d up(0, 0, 1);
-        axis = refDirection.cross(up.cross(refDirection));
-    } else if (!hasAxis && !hasRef) {
-        refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
-        Eigen::Vector3d up(0, 0, 1);
-        axis = refDirection.cross(up.cross(refDirection));
-    } else {
-        taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
-        axis = *a->components_;
-
-        taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
-        refDirection = *r->components_;
-        refDirection = axis.cross(refDirection).cross(axis); // refDirection needs to be orthogonal to axis
-    }
-
-    // axis and refDirection need to be orthogonal
-    return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection);
+    return taxonomy::make<taxonomy::matrix4>(o, z, x);
 }
 
 #endif

src/ifcopenshell-python/Makefile

@@ -27,14 +27,28 @@ SED:=sed -i '' -e
 endif
 endif
 
-SUPPORTED_PYVERSIONS := py310 py311 py312 py313 py314
-
-ifeq ($(filter $(PYVERSION),$(SUPPORTED_PYVERSIONS)),)
-$(error Unsupported PYVERSION=$(PYVERSION). Must be one of $(SUPPORTED_PYVERSIONS))
+# TODO: we should simplify this at some point...
+ifeq ($(PYVERSION), py39)
+PYNUMBER:=39
+endif
+ifeq ($(PYVERSION), py310)
+PYNUMBER:=310
+endif
+ifeq ($(PYVERSION), py311)
+PYNUMBER:=311
+endif
+ifeq ($(PYVERSION), py312)
+PYNUMBER:=312
+endif
+ifeq ($(PYVERSION), py313)
+PYNUMBER:=313
+endif
+ifeq ($(PYVERSION), py314)
+PYNUMBER:=314
+endif
+ifndef PYNUMBER
+$(error Unsupported PYVERSION '$(PYVERSION)')
 endif
-
-PYMINOR:=$(subst py3,,$(PYVERSION))
-PYNUMBER:=3$(PYMINOR)
 
 # We actually do support glibc 2.28-2.30 (see #5636)
 # but those are old and there's no demand for it.
@@ -79,6 +93,10 @@ test-parallel:
 test-mathutils:
 	pytest -p no:pytest-blender test/util/test_shape_builder.py
 
+.PHONY: build-ids-docs
+build-ids-docs:
+	mkdir -p test/build
+	cd test && python ids_doc_generator.py
 
 .PHONY: qa
 qa:

src/ifcopenshell-python/docs/ifcopenshell-python/selector_syntax.rst

@@ -257,8 +257,7 @@ nest formulas, for example ``concat(title("foo"), lower("Bar"))`` will produce
     "``join({{separator}}, {{values}})``", "``join(""-"", {{mats.Name}})``", "``Name1-Name2``", "Joins a list of items with a custom separator. By default, all lists a rendered as comma separated."
     "``{{value1}}[+-*/]{{value2}}``", "``{{z}}+3``", "``5``", "Does arithmetic. Typical operators such as +, -, \*, and / are allowed and can be mixed with other variables and formatting functions."
 
-When using queries in an IfcAnnotation tag surround with backticks. Examples: 
-
-- ````number({{Qto_WallBaseQuantities.Width}}, ",",".")````
-- ````round({{Qto_BuildingElementProxyQuantities.NetVolume}},.1)````
-- ````join(", OVER ", reverse({{material.item.Material.Name}}))````
+When using queries in an IfcAnnotation tag surround with backticks. 
+Examples: 
+````number({{Qto_WallBaseQuantities.Width}}, ",",".")```` or 
+````round({{Qto_BuildingElementProxyQuantities.NetVolume}},.1)````

src/ifcopenshell-python/ifcopenshell/__init__.py

@@ -111,8 +111,8 @@ __all__ = [
 ]
 
 try:
-    from .stream import stream, stream_entity  # ty: ignore[possibly-missing-import]
-    from .stream import stream as _stream  # ty: ignore[possibly-missing-import]
+    from .stream import stream, stream_entity
+    from .stream import stream as _stream
 except:
     pass
 
@@ -199,13 +199,11 @@ def open(
         for ty in bypass_types:
             f.bypass_type(ty)
         if mmap:
-            # mmap parameter is only available for builds with USE_MMAP, not used in our main builds
-            f.initialize(str(path.absolute()), mmap=mmap)  # type: ignore[unknown-argument]
+            f.initialize(str(path.absolute()), mmap=mmap)
         else:
             f.initialize(str(path.absolute()))
     elif mmap:
-        # mmap parameter is only available for builds with USE_MMAP, not used in our main builds
-        f = ifcopenshell_wrapper.open(str(path.absolute()), mmap=mmap)  # type: ignore[unknown-argument]
+        f = ifcopenshell_wrapper.open(str(path.absolute()), mmap=mmap)
     else:
         f = ifcopenshell_wrapper.open(str(path.absolute()))
     return file(f)

src/ifcopenshell-python/ifcopenshell/api/__init__.py

@@ -42,6 +42,7 @@ import importlib
 import inspect
 import json
 from collections.abc import Callable
+from functools import partial
 from typing import TYPE_CHECKING, Any, Optional
 
 import numpy
@@ -89,7 +90,11 @@ def renamed_arguments_deprecation(
 # "group.add_group": partial(
 #     renamed_arguments_deprecation, arguments_remapped={"Name": "name", "Description": "description"}
 # ),
-ARGUMENTS_DEPRECATION: dict[str, Callable[[str, dict[str, Any]], tuple[str, dict[str, Any]]]] = {}
+ARGUMENTS_DEPRECATION: dict[str, Callable[[str, dict[str, Any]], tuple[str, dict[str, Any]]]] = {
+    "control.assign_control": partial(
+        batching_argument_deprecation, prev_argument="related_object", new_argument="related_objects"
+    ),
+}
 
 
 CACHED_USECASE_CLASSES: dict[str, Callable] = {}

src/ifcopenshell-python/ifcopenshell/api/context/remove_context.py

@@ -51,10 +51,8 @@ def remove_context(file: ifcopenshell.file, context: ifcopenshell.entity_instanc
         new = context.ParentContext
         for inverse in file.get_inverse(context):
             if inverse.is_a("IfcCoordinateOperation"):
-                # Trick to make sure the coordinate operation is not referenced
-                # by a context so we can delete it safely
                 inverse.SourceCRS = inverse.TargetCRS
-                ifcopenshell.util.element.remove_deep2(file, inverse)
+                ifcopenshell.util.element.remove_deep(file, inverse)
             else:
                 ifcopenshell.util.element.replace_attribute(inverse, context, new)
         file.remove(context)

src/ifcopenshell-python/ifcopenshell/api/cost/edit_cost_value.py

@@ -59,6 +59,6 @@ def edit_cost_value(
                     value["ValueComponent"],
                 )
                 value = file.create_entity("IfcMeasureWithUnit", value_component, value["UnitComponent"])
-            if old_unit_basis:
-                ifcopenshell.util.element.remove_deep2(file, old_unit_basis)
+            if old_unit_basis and file.get_total_inverses(old_unit_basis) == 0:
+                ifcopenshell.util.element.remove_deep(file, old_unit_basis)
         setattr(cost_value, name, value)

src/ifcopenshell-python/ifcopenshell/api/feature/remove_feature.py

@@ -22,13 +22,11 @@ import ifcopenshell.util.element
 
 
 def remove_feature(file: ifcopenshell.file, feature: ifcopenshell.entity_instance) -> None:
-    """Permanently delete a feature element and its void or projection relationship.
+    """Remove a feature
 
-    The feature entity (e.g. IfcOpeningElement) is removed from the model
-    along with its IfcRelVoidsElement or IfcRelProjectsElement relationship.
-    The host element (wall, slab, etc.) is unaffected. Any fillings (windows,
-    doors) that occupied the opening become orphaned and must be separately
-    deleted via root.remove_product.
+    Fillings are retained as orphans. Featured elements remain. Features
+    cannot exist by themselves, so not only is the relationship removed, the
+    feature is also removed.
 
     :param feature: The IfcFeatureElement to remove.
 

src/ifcopenshell-python/ifcopenshell/api/geometry/add_boolean.py

@@ -31,6 +31,17 @@ def add_boolean(
 ) -> list[ifcopenshell.entity_instance]:
     """Adds a boolean operation to two or more representation items
 
+    If an IfcBooleanOperand is part of the top level items in an
+    IfcShapeRepresentation, it will be removed from that level whilst being
+    added to the IfcBooleanResult. This is because it is generally intuitive
+    that an item is either participating in a boolean operation, or being an
+    item in its own right, but not both.
+
+    However, if an IfcBooleanOperand is part of another boolean operation
+    already, it will not be removed from the existing operation. A new
+    operation will be created, and therefore it will participate in two
+    operations.
+
     This function protects against recursive booleans.
 
     After a boolean operation is made, since the items of
@@ -90,6 +101,9 @@ def add_boolean(
 
     booleans = []
     for second_item in second_items:
+        for inverse in file.get_inverse(second_item):
+            if inverse.is_a("IfcShapeRepresentation"):
+                inverse.Items = list(set(inverse.Items) - {second_item})
         if first.is_a("IfcTesselatedFaceSet"):
             first.Closed = True  # For now, trust the user to do the right thing.
         if second_item.is_a("IfcTesselatedFaceSet"):

src/ifcopenshell-python/ifcopenshell/api/geometry/add_representation.py

@@ -20,11 +20,11 @@ from __future__ import annotations
 import math
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 
-import bmesh  # pyright: ignore[reportMissingImports] # ty:ignore[unresolved-import]
-import bpy  # pyright: ignore[reportMissingImports] # ty:ignore[unresolved-import]
+import bmesh  # pyright: ignore[reportMissingImports]
+import bpy  # pyright: ignore[reportMissingImports]
 import numpy as np
 import numpy.typing as npt
-from mathutils import Matrix, Vector  # pyright: ignore[reportMissingImports] # ty:ignore[unresolved-import]
+from mathutils import Matrix, Vector  # pyright: ignore[reportMissingImports]
 
 import ifcopenshell.util.shape_builder
 import ifcopenshell.util.unit

src/ifcopenshell-python/ifcopenshell/api/geometry/add_wall_representation.py

@@ -47,9 +47,7 @@ def add_wall_representation(
     :param thickness: The thickness of the wall in meters.
     :param x_angle: The slope angle along the wall's X-axis, in radians.
     :param clippings: List of clipping definitions. Clippings can be `Clipping` objects
-        or dictionaries of arguments for `Clipping.parse`. Each clipping has a
-        ``normal`` that points toward the removed material (the discarded side),
-        not toward the kept material; see :func:`clip_solid` for details.
+        or dictionaries of arguments for `Clipping.parse`.
     :param booleans: List of any existing IfcBooleanResults.
     :return: IfcShapeRepresentation.
     """

src/ifcopenshell-python/ifcopenshell/api/geometry/edit_object_placement.py

@@ -52,11 +52,10 @@ def edit_object_placement(
     :param is_si: If True, the matrix is given in SI units. If false, in
         project units.
     :param should_transform_children: A child element is a nested element,
-        opening, filling, etc. If True, child elements move along with the
-        parent; pass True when moving an assembly (roof, furniture group, etc.)
-        and you want all children to follow. If False (default), child elements
-        keep their current world positions; their local placements are rewritten
-        to compensate for the parent move.
+        opening, filling, etc. If true, child elements will move along with the
+        parent. If false, child elements will stay where they are. Because most
+        placements in IFC are relative, this means that if a child moves, we
+        actually don't change their placement.
     :return: The new or updated IfcLocalPlacement entity
     """
     usecase = Usecase()

src/ifcopenshell-python/ifcopenshell/api/geometry/regenerate_wall_representation.py

@@ -69,12 +69,6 @@ def regenerate_wall_representation(
     additional extrusions are generated for each connection that boolean
     difference the base extrusion.
 
-    Clippings applied via :func:`geometry.clip_solid` or
-    :func:`geometry.clip_solid_bounded` are preserved only if the ``element``
-    parameter was passed when creating them, which registers the result in the
-    ``BBIM_Boolean`` property set.  Clippings created without that parameter
-    are silently discarded during regeneration.
-
     This will also update the axis line representation (e.g. trim the axis line
     to any connections).
 

src/ifcopenshell-python/ifcopenshell/api/geometry/validate_type.py

@@ -83,7 +83,6 @@ def validate_type(
 
     if remaining_items:
         ifcopenshell.api.geometry.add_boolean(file, preferred_item, remaining_items, "UNION")
-        representation.Items = [i for i in representation.Items if i not in remaining_items]
 
     representation.RepresentationType = ifcopenshell.util.representation.guess_type(representation.Items)
     if representation.RepresentationType == "CSG":

src/ifcopenshell-python/ifcopenshell/api/grid/remove_grid_axis.py

@@ -42,5 +42,7 @@ def remove_grid_axis(file: ifcopenshell.file, axis: ifcopenshell.entity_instance
         ifcopenshell.api.grid.remove_grid_axis(model, axis=axis_2)
     """
     axis_curve = axis.AxisCurve
+    if file.get_total_inverses(axis_curve) == 1:
+        ifcopenshell.util.element.remove_deep(file, axis_curve)
+        file.remove(axis_curve)
     file.remove(axis)
-    ifcopenshell.util.element.remove_deep2(file, axis_curve)

src/ifcopenshell-python/ifcopenshell/api/nest/assign_object.py

@@ -19,9 +19,7 @@
 from typing import Union
 
 import ifcopenshell
-import ifcopenshell.api.aggregate
 import ifcopenshell.api.owner
-import ifcopenshell.api.spatial
 import ifcopenshell.guid
 import ifcopenshell.util.element
 
@@ -139,10 +137,7 @@ def assign_object(
     if not objects_to_change:
         return is_nested_by
 
-    # Can be either only nested, aggregated, or contained at the same time.
-    possibly_contained = [o for o in objects_without_nests if hasattr(o, "ContainedInStructure")]
-    ifcopenshell.api.spatial.unassign_container(file, products=possibly_contained)
-    ifcopenshell.api.aggregate.unassign_object(file, products=objects_without_nests)
+    # NOTE: An object can both be nested and assigned to a container or an aggregate.
 
     # unassign elements from previous nests
     for nests in previous_nests_rels:

src/ifcopenshell-python/ifcopenshell/api/project/append_asset.py

@@ -431,7 +431,7 @@ class Usecase:
             )
             ifcopenshell.api.type.assign_type(
                 self.file,
-                should_run_listeners=False,  # ty:ignore[unknown-argument]
+                should_run_listeners=False,
                 related_objects=[element],
                 relating_type=new_type,
                 should_map_representations=False,

src/ifcopenshell-python/ifcopenshell/api/pset_template/remove_prop_template.py

@@ -22,9 +22,9 @@ import ifcopenshell.util.element
 def remove_prop_template(file: ifcopenshell.file, prop_template: ifcopenshell.entity_instance) -> None:
     """Removes a property template
 
-    Note that a property set template should always have at least one property
-    template to be valid. So a property set template will not be removed if it
-    is the only template ina a property ste template.
+    Note that a property set template should always have at least one
+    property template to be valid, so take care when removing property
+    templates.
 
     :param prop_template: The IfcSimplePropertyTemplate to remove.
     :return: None
@@ -43,8 +43,10 @@ def remove_prop_template(file: ifcopenshell.file, prop_template: ifcopenshell.en
         ifcopenshell.api.pset_template.remove_prop_template(model, prop_template=prop2)
     """
     for inverse in file.get_inverse(prop_template):
-        if len(inverse.HasPropertyTemplates) > 1:
+        if len(inverse.HasPropertyTemplates) == 1:
+            inverse.HasPropertyTemplates = []
+        else:
             has_property_templates = list(inverse.HasPropertyTemplates)
             has_property_templates.remove(prop_template)
             inverse.HasPropertyTemplates = has_property_templates
-    ifcopenshell.util.element.remove_deep2(file, prop_template)
+    ifcopenshell.util.element.remove_deep(file, prop_template)

src/ifcopenshell-python/ifcopenshell/api/pset_template/remove_pset_template.py

@@ -38,4 +38,4 @@ def remove_pset_template(file: ifcopenshell.file, pset_template: ifcopenshell.en
         # Let's remove the template.
         ifcopenshell.api.pset_template.remove_pset_template(model, pset_template=template)
     """
-    ifcopenshell.util.element.remove_deep2(file, pset_template)
+    ifcopenshell.util.element.remove_deep(file, pset_template)