ci-bonsai-daily - include submodules for a test

2026-08-06 16:01:36 +00:00 · 2025-05-21 13:00:46 +05:00
1229 changed files with 48201 additions and 91514 deletions
@@ -11,7 +11,7 @@ jobs:
      matrix:
        include:
          - os: macos
-            runner: macos-14
+            runner: macos-13
            arch: x64
            oldarch: 
          - os: macos
@@ -42,54 +42,25 @@ jobs:
      - name: Install Dependencies
        run: |
          brew update
-          # preinstalled: xz, cmake
-          brew install git bison autoconf automake libffi findutils
+          brew install git bison autoconf automake libffi cmake findutils
          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
-
-      - name: Install aws cli
-        run: |
-          python -m pip install awscli
-
+        
      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
-          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;

      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
        with:
-          key: mac-${{ matrix.arch }}
+          key: ${GITHUB_WORKFLOW}-${{ matrix.os }}

      - name: Run Build Script
-        shell: bash
        run: |
          if [ "${{ matrix.os }}" == "macos" ]; then
            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
          fi
-          if [ "${{ matrix.arch }}" == "x64" ]; then
-            arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-            MAC_INTEL=-mac-cross-compile-intel
-            # We don't use gmpcxx, but it comes preinstalled on macos runner as arm64 bottle
-            # and CGAL detects it and breaks cross compilation.
-            brew uninstall --ignore-dependencies gmp
-            # Required by Python.
-            /usr/local/bin/brew install gettext openssl
-          fi
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
-            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
-            | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-osx-${{ matrix.arch }}
-          path: |
-            build.log
-            build/*/*/*/logs/*.log
-            build/*/*/*/build/ifcopenshell/**/CMakeCache.txt
-          retention-days: 30
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup

      - name: Pack Dependencies
        run: |
@@ -110,7 +81,7 @@ jobs:
      - name: Package .zip archives
        run: |
          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/10.15/install/ifcopenshell
+          cd ./build/`uname`/*/10.9/install/ifcopenshell
          mkdir ~/output

          ls -d python-* | while read py_version; do
@@ -146,6 +117,20 @@ jobs:
          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
          aws-region: us-east-1

+      - name: Overwrite aws cli
+        run: |
+          # Error: The `brew link` step did not complete successfully
+          # The formula built, but is not symlinked into /usr/local
+          # Could not symlink bin/idle3
+          # Target /usr/local/bin/idle3
+          # already exists. You may want to remove it:
+          #   rm '/usr/local/bin/idle3'
+          #
+          # To force the link and overwrite all conflicting files:
+          #   brew link --overwrite python@3.13
+          # https://github.com/rust-lang/rustup/pull/3989/files
+          brew install --overwrite awscli | true
+
      - name: Upload .zip archives to S3
        run: |
          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive
@@ -19,7 +19,7 @@ jobs:
        with:
          submodules: recursive
          repository: pyodide/pyodide
-          ref: '0.28.0a3'
+          ref: '0.26.4'
          token: ${{ secrets.BUILD_REPO_TOKEN }}
          path: pyodide

@@ -29,18 +29,18 @@ jobs:
          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
          echo '#!/usr/bin/bash' > script.sh
-          echo 'cd pyodide' >> script.sh
-          echo 'make' >> script.sh
+          echo 'cd pyodide' > script.sh
+          echo 'make && pip install ./pyodide-build' >> script.sh
          echo 'cd ..' >> script.sh
          echo 'mkdir -p packages/ifcopenshell' >> script.sh
          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
-          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
+          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/20.18.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
          chmod +x script.sh
          sed -i s/--tty// pyodide/run_docker
          pyodide/run_docker ./script.sh
-          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp313-cp313-emscripten_4_0_9_wasm32.whl
+          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp312-cp312-emscripten_3_1_58_wasm32.whl

      - name: Configure AWS credentials
        uses: aws-actions/configure-aws-credentials@v4
@@ -16,8 +16,7 @@ jobs:
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz byacc
-          python3 -m pip install typing_extensions
+                         findutils
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -44,30 +43,18 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
-          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;

      # Not supported on docker
      # - name: ccache
      #   uses: hendrikmuhs/ccache-action@v1
      #   with:
-      #     key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64

      - name: Run Build Script
-        shell: bash
        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-rocky
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup

      - name: Pack Dependencies
        run: |
@@ -16,8 +16,7 @@ jobs:
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz byacc
-          python3 -m pip install typing_extensions
+                         findutils
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -44,30 +43,18 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          install_root=$(find ./build -maxdepth 4 -name install)
          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

      # Not supported on docker
      # - name: ccache
      #   uses: hendrikmuhs/ccache-action@v1
      #   with:
-      #     key: ubuntu-22.04-${{ runner.arch }}-rockylinux8
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64

      - name: Run Build Script
-        shell: bash
        run: |
-          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
-
-      - name: Upload Build Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-rocky-arm64
-          path: |
-            build.log
-            build/*/*/logs/*.log
-          retention-days: 30
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup

      - name: Pack Dependencies
        run: |
@@ -5,7 +5,7 @@ on:

 jobs:
  build_ifcopenshell:
-    runs-on: windows-2022
+    runs-on: windows-2019
    strategy:
      fail-fast: false
      matrix:
@@ -21,7 +21,7 @@ jobs:
        uses: actions/checkout@v3
        with:
          repository: IfcOpenShell/build-outputs
-          path: _deps-vs2022-x64-installed
+          path: _deps-vs2019-x64-installed
          ref: windows-${{ matrix.arch }}
          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}
@@ -40,7 +40,7 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          cd _deps-vs2022-x64-installed
+          cd _deps-vs2019-x64-installed
          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
            7z x $_.FullName
          }
@@ -53,17 +53,17 @@ jobs:
          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
              set PY_VER_MAJOR_MINOR=%%a%%b
          )
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
          SET IFCOS_INSTALL_PYTHON=FALSE
          cd win
-          echo y | call build-deps.cmd vs2022-x64 Release
+          echo y | call build-deps.cmd vs2019-x64 Release
          SET PYTHONHOME=C:\Python\${{ matrix.python }}
-          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
-          call install-ifcopenshell.bat vs2022-x64 Release
+          call run-cmake.bat vs2019-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
+          call install-ifcopenshell.bat vs2019-x64 Release

      - name: Pack Dependencies
        run: |
-          cd _deps-vs2022-x64-installed
+          cd _deps-vs2019-x64-installed
          Get-ChildItem -Path . -Directory | ForEach-Object {
            $cacheFile = "cache-$($_.Name).zip"
            echo $cacheFile
@@ -74,7 +74,7 @@ jobs:

      - name: Commit and Push Changes to Build Repository
        run: |
-          cd _deps-vs2022-x64-installed
+          cd _deps-vs2019-x64-installed
          git config user.name "IfcOpenBot"
          git config user.email "ifcopenbot@ifcopenshell.org"
          git add *.zip
@@ -90,7 +90,7 @@ jobs:

          if ("${{ matrix.python }}" -eq "3.9.11") {
            # only for the first python version the executables are assembled for upload
-            cd _installed-vs2022-x64/bin
+            cd _installed-vs2019-x64/bin
            Get-ChildItem -Path . | ForEach-Object {
              echo $_
              $exe = $_.Name
@@ -124,7 +124,4 @@ jobs:
          AWS_MAX_ATTEMPTS: 3
        run: |
          dir "$env:USERPROFILE\output"
-          foreach ($zip in Get-ChildItem -Path "$env:USERPROFILE\output" -Filter *.zip) {
-              aws s3 cp "$($zip.FullName)" s3://ifcopenshell-builds/ --debug
-              Start-Sleep -Seconds 5
-          }
+          aws s3 cp "$env:USERPROFILE\output" s3://ifcopenshell-builds/ --recursive --debug
@@ -34,7 +34,7 @@ jobs:
          cd src/bcf &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -4,6 +4,9 @@ on:
  push:
  pull_request:

+env:
+  PYTHON_VERSION: "3.12"
+
 jobs:
  lint-formatting:
    runs-on: ubuntu-latest
@@ -14,41 +17,27 @@ jobs:
      - name: Action - install python
        uses: actions/setup-python@v5.3.0
        with:
-          python-version: "3.9"
-
-      - name: Action - install python
-        uses: actions/setup-python@v5.3.0
-        with:
-          python-version: "3.11"
+          python-version: "${{ env.PYTHON_VERSION }}"

      - name: Install dependencies
        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          uv tool install ruff
-          uv tool install black
+          python3 -m pip install --upgrade pip
+          python3 -m pip install 'black>=24.10.0'

      # black doesn't catch all syntax errors, so we check them explicitly.
      - name: Check syntax errors
        id: syntax-errors
        run: |
          ERROR=0
-          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
+          python3 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3 -W error -m compileall -q src/bonsai || ERROR=1
          exit $ERROR
        continue-on-error: true

      - name: Black formatter
-        id: black
+        id: linting
        run: |
-          uvx black --diff --check .
-        continue-on-error: true
-
-      - name: Ruff check
-        id: ruff
-        run: |
-          uvx ruff check
-          # It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
-          uvx ruff check nix/build-all.py --target-version py37
+          python3 -m black --diff --check .
        continue-on-error: true

      - name: Final check
@@ -57,10 +46,7 @@ jobs:
          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
          fi
-          if [ "${{ steps.black.outcome }}" != "success" ]; then
-            echo "::error::Black formatting check failed, see 'black' step for the details." && ERROR=1
-          fi
-          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
-            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
+          if [ "${{ steps.linting.outcome }}" != "success" ]; then
+            echo "::error::Black formatting check failed, see 'linting' step for the details." && ERROR=1
          fi
          exit $ERROR
@@ -55,6 +55,8 @@ jobs:
          }
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -96,7 +98,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IFCOPENBOT_TOKEN }}
+          token: ${{ secrets.IOS_TO_BLENDER_REPO }}
          path: bonsai_unstable_repo

      - name: Download Blender and run critical tests
@@ -104,7 +106,7 @@ jobs:
          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.

          # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.5/blender-4.5.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.4/blender-4.4.0-linux-x64.tar.xz
          tar -xf blender.tar.xz

          # Setup Blender.
@@ -28,7 +28,7 @@ jobs:
          cd src/bsdd &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc4d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc5d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccityjson &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcclash &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccsv &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcdiff &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcfm &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -44,7 +44,6 @@ jobs:
        cmake \
         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-         -DCMAKE_CXX_STANDARD=17 \
         -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_PREFIX_PATH=/usr \
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312]
        config:
          - {
            name: "Windows 64bit",
@@ -44,8 +44,6 @@ jobs:
          }
    steps:
      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
@@ -61,7 +59,7 @@ jobs:
          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312, py313]
+        pyver: [py39, py310, py311, py312]
        config:
          - {
            name: "Windows 64bit",
@@ -39,8 +39,6 @@ jobs:
          }
    steps:
      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcpatch &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifctester &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: ortega2247/pypi-upload-action@master
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -71,27 +71,7 @@ jobs:
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
        with:
-          key: ubuntu-22.04-${{ runner.arch }}
-
-      # rocksdb on debian distros misses RTTI?
-      - name: build rocksdb
-        run: |
-          git clone https://github.com/facebook/rocksdb --branch v9.11.2
-          cd rocksdb
-          mkdir build && cd build
-          cmake -DFAIL_ON_WARNINGS=Off \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DWITH_TESTS=OFF \
-            -DWITH_TOOLS=OFF \
-            -DWITH_GFLAGS=OFF \
-            -DWITH_BENCHMARK_TOOLS=OFF \
-            -DWITH_CORE_TOOLS=OFF \
-            -DROCKSDB_BUILD_SHARED=Off \
-            -DCMAKE_POSITION_INDEPENDENT_CODE=On \
-            -DUSE_RTTI=On \
-            ..
-          sudo make -j$(nproc) install
+          key: ${GITHUB_WORKFLOW}

      - name: Build ifcopenshell
        run: |
@@ -102,7 +82,6 @@ jobs:
          cmake \
               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-               -DCMAKE_CXX_STANDARD=17 \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -122,7 +101,6 @@ jobs:
               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
               -DEIGEN_DIR=/usr/include/eigen3 \
-               -DWITH_ROCKSDB=On \
             ../cmake
          sudo make -j $(nproc)
          sudo make install
@@ -149,21 +127,12 @@ jobs:
          cd ../src/ifcopenshell-python
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
-          ERROR=0
-          make test || ERROR=1
-          cd ../bcf && make test || ERROR=1
+          make test
+          cd ../bcf && make test
          pip install requests
-          cd ../bsdd && make test || ERROR=1
+          cd ../bsdd && make test
          pip install deepdiff
-          cd ../ifcdiff && make test || ERROR=1
-          cd ../ifcpatch && make test || ERROR=1
+          cd ../ifcdiff && make test
+          cd ../ifcpatch && make test
          pip install -e ../ifctester --no-deps
-          cd ../ifctester && make test || ERROR=1
-          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
-          cd ../ifcopenshell-python
-          pip install mathutils
-          make test-mathutils || ERROR=1
-          if [ $ERROR -ne 0 ]; then
-            echo "One or more tests failed";
-            exit 1;
-          fi
+          cd ../ifctester && make test
@@ -46,7 +46,6 @@ jobs:
          mkdir build && cd build
          cmake \
           -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
-           -DCMAKE_CXX_STANDARD=17 \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_PREFIX_PATH=/usr \
           -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -86,7 +86,6 @@ src/bonsai/bonsai/bim/data/build/
 src/bonsai/bonsai/bim/data/gantt/index.html
 src/bonsai/bonsai/bim/data/gantt/jsgantt.js
 src/bonsai/bonsai/bim/data/gantt/jsgantt.css
-src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js

 src/bonsai/drawings
 src/bonsai/layouts
@@ -108,5 +107,3 @@ src/bonsai/bonsai/bim/schema/Brick.ttl

 bonsaiDecoratorForLoads.code-workspace
 dev_environment.bat
-
-.pixi/
@@ -1 +1 @@
-0.8.4
+0.8.3
@@ -18,12 +18,7 @@
 ################################################################################

 cmake_minimum_required(VERSION 3.21)
-if (NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
-endif()
-if (CMAKE_CXX_STANDARD LESS 17)
-    message(FATAL_ERROR "C++17 or newer is required.")
-endif()
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

@@ -34,12 +29,13 @@ endif()

 add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)

-if(POLICY CMP0144) # 3.27
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0078 NEW)
+cmake_policy(SET CMP0086 NEW)
+if (POLICY CMP0144)
    cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
 endif()
-if(POLICY CMP0167) # 3.30
-    cmake_policy(SET CMP0167 OLD)
-endif()

 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -68,7 +64,7 @@ option(BUILD_IFCPYTHON "Build IfcPython." ON)
 option(BUILD_CONVERT "Build IfcConvert executable." ON)
 option(BUILD_DOCUMENTATION "Build IfcOpenShell Documentation." OFF)
 option(BUILD_EXAMPLES "Build example applications." ON)
-option(BUILD_GEOMSERVER "Build IfcGeomServer executable (Open CASCADE is required)." ON)
+option(BUILD_GEOMSERVER "Build IfcGeomServer executable." ON)
 option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)
@@ -83,19 +79,11 @@ option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." O
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
 option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." OFF)
 option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
-option(WITH_ROCKSDB "Support a RocksDB key-value store as a file backend in IfcOpenShell" OFF)
-option(WITH_ZSTD "Use Zstd compression in RocksDB writes" OFF)

 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
 option(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
 option(VERSION_OVERRIDE "Override the version defined in IfcParse.h with the file VERSION in the repository root" OFF)

-set(
-    PYTHON_MODULE_INSTALL_DIR
-    "" CACHE PATH
-    "Directory to install IfcPython package to. By default package is installed in found Python's site-packages."
-)
-
 if (VERSION_OVERRIDE)
    file(READ "../VERSION" "RELEASE_VERSION_")
    string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
@@ -229,18 +217,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 endmacro()

 if(WITH_CGAL)
-    if(NOT CGAL_INCLUDE_DIR)
-        find_package(CGAL REQUIRED)
-        if(NOT CGAL_DIR)
-            message(
-                FATAL_ERROR
-                "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
-            )
-        endif()
-        message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
-        link_libraries(CGAL::CGAL)
-    endif()
-
    add_definitions(-DIFOPSH_WITH_CGAL)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)

@@ -259,33 +235,22 @@ endif()

 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    if(NOT JSON_INCLUDE_DIR)
-        find_package(nlohmann_json CONFIG)
-        if(nlohmann_json_DIR)
-            link_libraries(nlohmann_json::nlohmann_json)
-        else()
-            message(STATUS "Unable to find nlohmann_json package, trying to find it as a header-only library.")
-        endif()
-    endif()
+    clear_wasm_sysroot()
+    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+    restore_wasm_sysroot()
+    set(JSON_INCLUDE_DIR ${json_header_path})

-    if(NOT nlohmann_json_DIR)
-        clear_wasm_sysroot()
-        find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-        restore_wasm_sysroot()
-        set(JSON_INCLUDE_DIR ${json_header_path})
-
-        if(json_header_path)
-            message(STATUS "JSON for Modern C++ header file found in '${JSON_INCLUDE_DIR}'.")
-        else()
-            message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
-        endif()
+    if(json_header_path)
+        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
+    else()
+        message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
    endif()

    add_definitions(-DWITH_GLTF)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()

-# Add USD support to serializers
+# Add USD support to serializers 
 if(USD_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
    UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
@@ -308,13 +273,13 @@ if(USD_SUPPORT)
    endif()

    set(USD_LIBRARIES
-            usd_usd
+            usd_usd 
            usd_usdGeom
-            usd_usdShade
-            usd_usdLux
-            usd_vt
-            usd_sdf
-            usd_tf
+            usd_usdShade 
+            usd_usdLux 
+            usd_vt 
+            usd_sdf 
+            usd_tf 
            usd_gf
        )

@@ -332,38 +297,6 @@ if(USD_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
 endif(USD_SUPPORT)

-if (WITH_ROCKSDB)
-    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
-    # find it's zstd dependency on Windows.
-    # Only do it on Windows, otherwise it might create problems as
-    # findzstd and zstd-config target names do not match.
-    if(WIN32)
-        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-    endif()
-    find_package(RocksDB CONFIG REQUIRED)
-    if(WIN32)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
-    endif()
-
-    message(STATUS "RocksDB: found at '${RocksDB_DIR}'.")
-    add_definitions(-DIFOPSH_WITH_ROCKSDB)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB)
-    link_libraries(RocksDB::rocksdb)
-
-    if (WITH_ZSTD)
-        # @todo do we actually need the zstd include dir or rather just pass
-        # the libzstd.a along with the rocksdb library when needed and feature
-        # detect based on rocksdb API?
-        find_package(zstd CONFIG REQUIRED)
-        message(STATUS "zstd: found at '${zstd_DIR}'.")
-        link_libraries(zstd::libzstd_static)
-
-        add_definitions(-DIFOPSH_WITH_ROCKSDB_ZSTD)
-        set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB_ZSTD)
-    endif()
-endif()
-
 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
 # runtime, when doing running conda-build we pick what conda prepared for us.
 if(WIN32 AND("$ENV{CONDA_BUILD}" STREQUAL ""))
@@ -420,31 +353,7 @@ message(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")
 if(NOT MINIMAL_BUILD)
    # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
    clear_wasm_sysroot()
-    if(IFCXML_SUPPORT)
-        if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
-            # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04?)
-            find_package(LibXml2 QUIET CONFIG)
-
-            if(NOT LibXml2_FOUND)
-                # Fallback to CMake's builtin FindLibXml2 module (works on Ubuntu)
-                find_package(LibXml2 REQUIRED)
-            else()
-                message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
-            endif()
-
-            if(TARGET LibXml2::LibXml2)
-                # Config mode already gives us the target
-                set(LIBXML2_LIBRARIES LibXml2::LibXml2)
-                get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
-            else()
-                # Module mode (Ubuntu)
-                set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
-                set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
-            endif()
-        else()
-            find_package(LibXml2 REQUIRED)
-        endif()
-    endif()
+    find_package(LibXml2 REQUIRED)
    restore_wasm_sysroot()
 endif()

@@ -454,73 +363,50 @@ if(IFCXML_SUPPORT)
 endif()

 if(BUILD_IFCGEOM)
-    if(MSVC AND NOT LibXml2_DIR)
+    if(MSVC)
        add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
    endif()

    # Open CASCADE
    if(WITH_OPENCASCADE)
-    if(OCC_INCLUDE_DIR)
+    if("${OCC_INCLUDE_DIR}" STREQUAL "")
+	clear_wasm_sysroot()
+        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
+            PATHS
+                /usr/include/occt
+                /usr/include/oce
+                /usr/include/opencascade
+            REQUIRED
+        )
+	restore_wasm_sysroot()
+
+        if(OCC_INCLUDE_DIR)
+            message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
+        else()
+            message(FATAL_ERROR "Unable to find Open CASCADE include directory, specify OCC_INCLUDE_DIR manually.")
+        endif()
+    else()
        set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
        message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
    endif()

-    if(OCC_LIBRARY_DIR)
-        set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
-        message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-    endif()
-
-    # No specific paths specified, try to find package.
-    if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
-        message(
-            STATUS
-            "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
-            "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
-        )
-        # Parse OCC_VERSION_STRING.
+    if(OCC_INCLUDE_DIR)
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
            REGEX "#define OCC_VERSION_MAJOR.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
-            REGEX "#define OCC_VERSION_MINOR.*"
+          REGEX "#define OCC_VERSION_MINOR.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
-            REGEX "#define OCC_VERSION_MAINTENANCE.*"
+          REGEX "#define OCC_VERSION_MAINTENANCE.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
        set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-    elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
-        # OCE is not supported for find_package, because it's using a different name (`oce`)
-        # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
-        find_package(OpenCASCADE CONFIG REQUIRED)
-        set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
-        # Do not use OpenCASCADE_LIBRARY_DIR for OCC_LIBRARY_DIR - check target property explicitly.
-        # On Windows there is a case with OpenCASCADE_LIBRARY_DIR points to `lib` folder,
-        # while TKernel is actually in `libi`.
-        get_target_property(TKERNEL_LIB_PATH TKernel LOCATION)
-        get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
-        set(OCC_VERSION_STRING ${OpenCASCADE_VERSION})
-        message(
-            STATUS
-            "Found Open CASCADE package at '${OpenCASCADE_DIR}', "
-            "deducing from it OCC_INCLUDE_DIR: '${OCC_INCLUDE_DIR}' "
-            "and OCC_LIBRARY_DIR: '${OCC_LIBRARY_DIR}'."
-        )
-    else()
-        message(
-            FATAL_ERROR
-            "Couldn't find Open CASCADE installation. "
-            "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
-            "must be specified or OpenCASCADE package should be discoverable. "
-            "If you're using OCE, then providing a package is not available "
-            "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
-        )
-    endif()
+    endif(OCC_INCLUDE_DIR)

-    set(
-        OPENCASCADE_LIBRARY_NAMES
+    set(OPENCASCADE_LIBRARY_NAMES
        TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
        TKFillet TKXSBase TKOffset TKHLR

@@ -534,6 +420,24 @@ if(BUILD_IFCGEOM)
        list(APPEND OPENCASCADE_LIBRARY_NAMES TKDESTEP TKDEIGES)
    endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)

+    if("${OCC_LIBRARY_DIR}" STREQUAL "")
+        find_library(OCC_LIBRARY TKernel
+            PATHS
+                /usr/lib
+            REQUIRED
+        )
+
+        if(OCC_LIBRARY)
+            GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
+            message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
+        else()
+            message(FATAL_ERROR "Unable find Open CASCADE library directory, specify OCC_LIBRARY_DIR manually.")
+        endif()
+    else()
+        set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
+        message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
+    endif()
+
    clear_wasm_sysroot()
    find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
    restore_wasm_sysroot()
@@ -541,10 +445,7 @@ if(BUILD_IFCGEOM)
    if(libTKernel)
        message(STATUS "Required Open Cascade Library files found")
    else()
-        message(
-            FATAL_ERROR
-            "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting"
-        )
+        message(FATAL_ERROR "Unable to find Open Cascade library files, aborting")
    endif()

    # Use the found libTKernel as a template for all other OCC libraries
@@ -575,7 +476,7 @@ if(BUILD_IFCGEOM)

    if(OCCT_STATIC)
        find_package(Threads)
-
+        
        if(WASM_BUILD)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
        else()
@@ -587,7 +488,7 @@ if(BUILD_IFCGEOM)
                set(OPENCASCADE_LIBRARIES -Wl,--start-group ${OPENCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
            endif()
        endif()
-
+        
        if(NOT APPLE AND NOT WIN32)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "rt")
        endif()
@@ -598,18 +499,7 @@ if(BUILD_IFCGEOM)
    endif(WITH_OPENCASCADE)
 endif(BUILD_IFCGEOM)

-if(COLLADA_SUPPORT AND (NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR))
-    # If package is found, automatically sets
-    # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
-    find_package(OpenCOLLADA CONFIG)
-    if(OpenCOLLADA_DIR)
-        message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
-        set(OPENCOLLADA_FOUND TRUE)
-    else()
-        message(STATUS "OpenCOLLADA package not found, falling back to manual search.")
-    endif()
-endif()
-if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
+if(COLLADA_SUPPORT)
    # Find OpenCOLLADA
    if("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
        message(STATUS "No OpenCOLLADA include directory specified")
@@ -642,7 +532,8 @@ if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)

    if(COLLADASWStreamWriter_h)
        message(STATUS "OpenCOLLADA header files found")
-        set(OPENCOLLADA_FOUND TRUE)
+        add_definitions(-DWITH_OPENCOLLADA)
+        set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)

        set(OPENCOLLADA_LIBRARY_NAMES
            GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
@@ -690,12 +581,7 @@ if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
    endif()
-endif(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
-if(COLLADA_SUPPORT AND OPENCOLLADA_FOUND)
-    add_definitions(-DWITH_OPENCOLLADA)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
-endif()
-
+endif(COLLADA_SUPPORT)

 if(HDF5_SUPPORT)
    if("${HDF5_INCLUDE_DIR}" STREQUAL "")
@@ -762,25 +648,15 @@ if(HDF5_SUPPORT)
        endif()
    endif()

-    if(NOT HDF5_INCLUDE_DIR)
-        # First try to find it as a config.
-        find_package(HDF5 CONFIG)
-        if(HDF5_DIR)
-            message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
-            set(HDF5_LIBRARIES hdf5_cpp-static)
-        else()
-            # If it failed, still try to find as a module.
-            # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
-            # Will automatically fill HDF5_LIBRARIES and HDF5_INCLUDE_DIR.
-            find_package(HDF5)
-            if(NOT HDF5_INCLUDE_DIR)
-                message(
-                    FATAL_ERROR
-                    "HDF5_LIBRARY_DIR is not provided (current value: '${HDF5_LIBRARY_DIR}'). "
-                    "Also could not find HDF5 package (neither module or config)."
-                )
-            endif()
-        endif()
+    if(NOT HDF5_LIBRARIES)
+        # debian default
+        set(HDF5_LIBRARIES
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
+            /usr/lib/x86_64-linux-gnu/libsz.so
+            /usr/lib/x86_64-linux-gnu/libaec.so
+            z dl
+        )
    endif()

    add_definitions(-DWITH_HDF5)
@@ -897,23 +773,6 @@ else()
    endif()
 endif(MSVC)

-
-# Ensure other dependencies are provided.
-if(NOT EXISTS "${EIGEN_DIR}")
-    find_package(Eigen3 CONFIG)
-    if(Eigen3_DIR)
-        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
-    else()
-        message(
-            FATAL_ERROR
-            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
-            "Also couldn't find Eigen3 as a package."
-        )
-    endif()
-    link_libraries(Eigen3::Eigen)
-endif()
-
-
 include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
    ${EIGEN_DIR} ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
@@ -923,7 +782,7 @@ include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCL
 if(NOT SCHEMA_VERSIONS)
    if(WASM_BUILD)
        # super arbitrarily try to keep size down at least a little bit
-        set(SCHEMA_VERSIONS "2x3" "4" "4x3_add2")
+        set(SCHEMA_VERSIONS "2x3" "4")
    else()
        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
    endif()
@@ -1014,7 +873,7 @@ if(BUILD_IFCGEOM)
 	if(WASM_BUILD)
 	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	else()
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
+	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})	
 	endif()
 endif()

@@ -1072,20 +931,9 @@ endforeach()

 set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})

-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-        message(STATUS "GCC < 9 detected, linking stdc++fs explicitly")
-        set(STDCPPFS stdc++fs)
-    endif()
-endif()
-
 add_library(IfcParse ${IFCPARSE_FILES})
-target_link_libraries(IfcParse ${STDCPPFS})
 set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

-if(LibXml2_DIR)
-    target_compile_definitions(IfcParse PRIVATE ${LIBXML2_DEFINITIONS})
-endif()
 if(WASM_BUILD)
    target_link_libraries(IfcParse ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 else()
@@ -1093,11 +941,7 @@ else()
 endif()

 if(BUILD_IFCGEOM)
-    # CGAL::CGAL target already has dependencies resolved.
-    if(WITH_CGAL AND CGAL_DIR)
-        set(CGAL_LIBRARIES CGAL::CGAL)
-        message(STATUS "Using found CGAL package at '${CGAL_DIR}'")
-    elseif(WITH_CGAL AND NOT CGAL_DIR)
+    if(WITH_CGAL)
 	clear_wasm_sysroot()
        find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
        find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -1118,7 +962,7 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
-
+        
        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
        # needed?
@@ -1126,7 +970,7 @@ if(BUILD_IFCGEOM)
        # endif()
        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES})
        list(APPEND kernel_libraries geometry_kernel_${kernel})
-
+        
        if(${kernel} STREQUAL "cgal")
            set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")

@@ -1146,7 +990,7 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
-
+        
        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
@@ -1185,7 +1029,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
    foreach(schema ${SCHEMA_VERSIONS})
        add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES})
        set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-
+        
        if(WASM_BUILD)
            target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES})
        else()
@@ -1277,11 +1121,6 @@ endif(BUILD_CONVERT)

 # IfcGeomServer
 if(BUILD_GEOMSERVER)
-
-    if(NOT WITH_OPENCASCADE)
-        message(FATAL_ERROR "Open CASCADE is required to build IfcGeomServer.")
-    endif()
-
    file(GLOB CPP_FILES ../src/ifcgeomserver/*.cpp)
    file(GLOB H_FILES ../src/ifcgeomserver/*.h)
    set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
@@ -1302,10 +1141,6 @@ endif(BUILD_GEOMSERVER)
 if(ADD_COMMIT_SHA)
    find_package(Git)

-    if(NOT GIT_FOUND)
-        message(FATAL_ERROR "Failed to find Git for ADD_COMMIT_SHA option.")
-    endif()
-
    if(GIT_FOUND)
        if (VERSION_OVERRIDE)
            set (git_branch ${RELEASE_VERSION})
@@ -1336,7 +1171,6 @@ if(ADD_COMMIT_SHA)
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )

-        set(git_sha "418eb277d")
        message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
        message(STATUS "IfcOpenShell commit: \"${git_sha}\"")

@@ -1375,7 +1209,7 @@ if(BUILD_IFCMAX)
 endif()

 if(WITH_CGAL)
-    add_subdirectory(../src/svgfill svgfill)
+    add_subdirectory(../src/svgfill svgfill)        
 endif()

 if(BUILD_QTVIEWER)
@@ -1433,13 +1267,11 @@ if(BUILD_CONVERT)
 endif(BUILD_CONVERT)

 if(BUILD_CONVERT OR BUILD_IFCPYTHON)
-    if(WITH_OPENCASCADE)
-        install(TARGETS geometry_serializer ${geometry_serializer_libraries}
-            ARCHIVE DESTINATION ${LIBDIR}
-            LIBRARY DESTINATION ${LIBDIR}
-            RUNTIME DESTINATION ${BINDIR}
-        )
-    endif()
+    install(TARGETS geometry_serializer ${geometry_serializer_libraries}
+        ARCHIVE DESTINATION ${LIBDIR}
+        LIBRARY DESTINATION ${LIBDIR}
+        RUNTIME DESTINATION ${BINDIR}
+    )
 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)

 # Cmake uninstall target
@@ -1457,8 +1289,6 @@ endif()
 list(APPEND CPACK_SOURCE_IGNORE_FILES
    "/\\\\.git"
    "/build/"
-    "/.pytest_cache/"
-    "/__pycache__/"
 )
 set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/..;/")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}")
@@ -1,114 +0,0 @@
-{
-  "version": 6,
-  "configurePresets": [
-    {
-      "name": "shared",
-      "generator": "Ninja",
-      "hidden": true,
-      "cacheVariables": {
-        "BUILD_IFCPYTHON": "ON",
-        "BUILD_IFCGEOM": "ON",
-        "COLLADA_SUPPORT": "OFF",
-        "BUILD_EXAMPLES": "OFF",
-        "BUILD_GEOMSERVER": "OFF",
-        "GLTF_SUPPORT": "ON",
-        "BUILD_CONVERT": "ON",
-        "BUILD_IFCMAX": "OFF",
-        "IFCXML_SUPPORT": "ON",
-        "HDF5_SUPPORT": "ON",
-        "SCHEMA_VERSIONS": "4x3_add2",
-        "CITYJSON_SUPPORT": "OFF",
-        "CMAKE_GENERATOR_PLATFORM": "",
-        "CMAKE_GENERATOR_TOOLSET": ""
-      }
-    },
-    {
-      "name": "win-shared",
-      "inherits": [
-        "shared"
-      ],
-      "hidden": true,
-      "environment": {
-        "CONDA_BUILD": "ON",
-        "CONDA_PY": "312"
-      },
-      "cacheVariables": {
-        "Boost_USE_STATIC_LIBS": "OFF",
-        "CMAKE_INSTALL_PREFIX": "$env{LIBRARY_PREFIX}",
-        "PYTHON_EXECUTABLE": "$env{PREFIX}/python.exe",
-        "PYTHON_INCLUDE_DIR": "$env{PREFIX}/include",
-        "PYTHON_LIBRARY": "$env{PREFIX}/libs/python$env{CONDA_PY}.lib",
-        "CMAKE_FIND_ROOT_PATH": "$env{LIBRARY_PREFIX}",
-        "CMAKE_PREFIX_PATH": "$env{LIBRARY_PREFIX}",
-        "LIBXML2_LIBRARIES": "$env{LIBRARY_PREFIX}/lib/libxml2.lib",
-        "OCC_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include/opencascade",
-        "OCC_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "CGAL_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "EIGEN_DIR": "$env{LIBRARY_PREFIX}/include/eigen3",
-        "JSON_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "GMP_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
-        "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
-        "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include"
-      }
-    },
-    {
-      "name": "win-release",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/prod",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/prod/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "win-debug",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-debug",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/dev",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/dev/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "win-test",
-      "inherits": [
-        "win-shared"
-      ],
-      "hidden": false,
-      "binaryDir": "${sourceDir}/../build/win-test",
-      "warnings": {
-        "dev": false
-      },
-      "environment": {
-        "PREFIX": "${sourceDir}/../.pixi/envs/tests",
-        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/tests/Library"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "SCHEMA_VERSIONS": "2x3;4;4x3_add2"
-      }
-    }
-  ]
-}
@@ -121,4 +121,4 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
        PARENT_SCOPE
    )
-endfunction()
+endfunction()
@@ -9,7 +9,6 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
 -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
 -D CMAKE_BUILD_TYPE:STRING=Release ^
- -D CMAKE_CXX_STANDARD=17 ^
 -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -16,7 +16,6 @@ cmake ${CMAKE_ARGS} -G Ninja \
 -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
- -DCMAKE_CXX_STANDARD=17 \
  ${CMAKE_PLATFORM_FLAGS[@]} \
 -DCMAKE_PREFIX_PATH=$PREFIX \
 -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -1,6 +1,3 @@
-python:
-  - 3.12
-
 occt:
  - 7.8.1

@@ -31,7 +28,7 @@ hdf5:
 libboost_devel:
 - '1.86'
 libxml2:
- 2.13
+- '2'
 mpfr:
 - '4'
 gmp:
@@ -55,4 +52,4 @@ MACOSX_DEPLOYMENT_TARGET:      # [osx]
  - 10.13                      # [osx and x86_64]

 CONDA_BUILD_SYSROOT:  # [osx]
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx and x86_64]
+  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx and x86_64]
@@ -1,13 +0,0 @@
-diff --git a/OpenCOLLADAConfig.cmake.in b/OpenCOLLADAConfig.cmake.in
-index d765b108..6800c2a7 100644
--- a/OpenCOLLADAConfig.cmake.in
-+++ b/OpenCOLLADAConfig.cmake.in
-@@ -31,7 +31,7 @@ set(OPENCOLLADA_INCLUDE_DIRS
- include("@PACKAGE_OPENCOLLADA_INST_CMAKECONFIG@/OpenCOLLADATargets.cmake")
- 
- # Set the library variable
-if(UNIX)
-+if(0)
- 	set(OPENCOLLADA_LIBRARIES
- 		ftoa_shared
- 		buffer_shared
@@ -1,84 +0,0 @@
-[project]
-name = "IfcOpenShell"
-version = "0.8.4"
-description = "IfcOpenShell is a library to support the IFC file format"
-channels = ["conda-forge"]
-platforms = ["win-64", "linux-64", "osx-64"]
-
-[environments]
-common = { features = ["common"], no-default-feature = true }
-prod = { features = ["prod", "common"], no-default-feature = true }
-dev = { features = ["dev", "common"], no-default-feature = true }
-lint = { features = ["lint"], no-default-feature = true }
-tests = { features = ["tests", "common"], no-default-feature = true }
-
-[feature.lint.dependencies]
-ruff = "*"
-black = "*"
-
-[feature.common.dependencies]
-# Build deps
-cmake = "==3.30.5"
-ninja = "*"
-swig = "*"
-c-compiler = "*"
-cxx-compiler = "*"
-
-# Runtime deps
-python = "3.12.*"
-libboost-devel = "*"
-occt = { version = "*", build = "*novtk*" }
-cgal-cpp = "*"
-numpy = "*"
-lark = "*"
-hdf5 = "*"
-eigen = "*"
-mpfr = "*"
-gmp = "*"
-nlohmann_json = "*"
-zlib = "*"
-# Not strictly necessary
-pythonocc-core = "*"
-
-[feature.tests.dependencies]
-pytest = "*"
-shapely = "*"
-tabulate = "*"
-isodate = "*"
-python-dateutil = "*"
-xmlschema = "*"
-xsdata = "*"
-lxml = "*"
-networkx = "*"
-
-[feature.common.target.win-64.dependencies]
-vs2022_win-64 = "*"
-#vs_win-64 = "*" # Visual Studio
-#vswhere = "*" # Visual Studio
-
-[feature.common.tasks]
-init-submodules = { cmd = "git submodule update --init --recursive", outputs =["$PIXI_PROJECT_ROOT/src/svgfill/3rdparty/svgpp/*"]}
-
-[feature.prod.target.win-64.tasks]
-configure-release = { cmd = ["cmake", "--preset", "win-release", "-B", "build/win-release", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }] }
-build-release = { cmd = ["cmake", "--build", "build/win-release", "--config", "Release"], description = "Build the project" }
-
-[feature.dev.target.win-64.tasks]
-configure-debug = { cmd = ["cmake", "--preset", "win-debug", "-B", "build/win-debug", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-debug/CMakeCache.txt"] }
-build-debug = { cmd = ["cmake", "--build", "build/win-debug", "--config", "Debug"], description = "Build the project", depends-on = ["configure-debug"] }
-install-debug = { cmd = ["cmake", "--install", "build/win-debug", "--config", "Debug"], description = "Install the project" } # Optionally Install files to your desired env using --prefix
-
-vsdebug = { cmd = ["python"], description = "Run a python script with vs debugger attached" }
-
-[feature.tests.tasks]
-configure-test = { cmd = ["cmake", "--preset", "win-test", "-B", "build/win-test", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-test/CMakeCache.txt"] }
-build-test = { cmd = ["cmake", "--build", "build/win-test", "--config", "Release"], description = "Build the project", depends-on = ["configure-test"], outputs=["build/win-test/IfcGeom.lib"] }
-install-test = { cmd = ["cmake", "--install", "build/win-test", "--config", "Release"], description = "Install the project", depends-on = ["build-test"] } # Optionally Install files to your desired env using --prefix
-
-test = { cmd = "pytest .", cwd="src/ifcopenshell-python/test", depends-on=["install-test"], env = {PYTHONPATH="$PIXI_PROJECT_ROOT/src/ifcpatch"}}
-
-[feature.lint.tasks]
-lint = { cmd = "ruff check && black --diff --check ."}
-
-[feature.common.target.win-64.activation]
-#scripts = ["cmake/activate.bat"]
@@ -7,7 +7,7 @@ source:

 build:
  script: |
-    BUILD_CFG=Release python nix/build-all.py --without-rocksdb --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py313 IfcOpenShell-Python
+    BUILD_CFG=Release python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py312 IfcOpenShell-Python
    mv package/ifcopenshell .
    cp pyodide/setup.py .

@@ -1,8 +1,28 @@
 [tool.black]
 line-length = 120
 include = '''
-    src/.*.pyi?$
-    |nix/.*.pyi?$
+    src/(
+        bcf
+        |bcfserver
+        |bonsai
+        |bsdd
+        |foundationserver
+        |ifc2ca
+        |ifc4d
+        |ifc5d
+        |ifcbimtester
+        |ifcblender
+        |ifccityjson
+        |ifcclash
+        |ifccsv
+        |ifcdiff
+        |ifcfm
+        |ifcpatch
+        |ifctester
+        |ifcopenshell-python
+        |ifcsverchok
+        |opencdeserver
+    )/.*.py$
 '''
 extend-exclude = '''
    src/ifcopenshell-python/ifcopenshell/express/*
@@ -10,57 +30,11 @@ extend-exclude = '''
    |src/ifcopenshell-python/ifcopenshell/simple_spf/*
    |src/ifc2ca/templates/*
    |src/ifcconvert/cityjson/*
-    |src/svgfill
-    |src/exterior-shell-extractor
-    |src/pyodide
 '''

 [tool.pyright]
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
 reportUnnecessaryTypeIgnoreComment = true
-
-# Define here general ruff settings,
-# then they will be inherited projects .toml files.
-# This allows using assuming different Python version for different projects.
-[tool.ruff]
-exclude = [
-    # Submodules.
-    "src/ifcconvert/cityjson",
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill",
-    #
-    # Unformatted.
-    "src/exterior-shell-extractor",
-    # Incompatible with linter.
-    "src/ifc2ca/templates",
-]
-[tool.ruff.lint]
-select = [
-    # Default Ruff rules.
-    # "E4",        # imports
-    # "E7",        # statements
-    "E9",          # io errors
-    # "F",         # pyflakes
-    #
-    "FA",          # future annotations
-    "UP",          # pyupgrade
-    "RUF015",      # next() > list_comprehension[0]
-    "RUF022",      # sort __all__
-]
-ignore = [
-    "FA100", # Conflicts with Blender using annotations for props definitions.
-    # Maybe will enable later:
-    "UP007", # Optional to X | Y
-    "UP045", # Optional to X | None
-    "UP015", # Unnecessary mode argument
-    "UP028", # yield for -> yield from
-    "UP030", # implicit references for positional format fields
-    "UP031", # Replace % with .format
-    "UP032", # Replace .format with f-string
-
-    # Deprecated Ruff rules.
-    "UP038", # Use X | Y in isinstance
-]
+# Just to add a quick insert of `# pyright: ignore[xxx]` comments in Pylance.
+enableTypeIgnoreComments = false
@@ -6,7 +6,6 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 original idea from https://stackoverflow.com/a/19722365/1307905
 """

-from __future__ import annotations
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -48,7 +47,7 @@ class InMemoryZipFile:
    def data(self) -> bytes:
        return self.in_memory_data.getvalue()

-    def __enter__(self) -> InMemoryZipFile:
+    def __enter__(self) -> "InMemoryZipFile":
        return self

    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
@@ -1,6 +1,5 @@
 """BCF XML V2 handler."""

-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -32,7 +31,7 @@ class BcfXml:
        self._extension_schema: Optional[bytes] = None
        self._zip_file = self._load_zip_file()

-    def __enter__(self) -> BcfXml:
+    def __enter__(self) -> "BcfXml":
        return self

    def __exit__(self, *args: Any) -> None:
@@ -100,7 +99,7 @@ class BcfXml:
            extensions = mdl_extensions.Extensions()

            xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO(self.extension_schema))
+            root = etree.parse(io.BytesIO((self.extension_schema)))

            attrs = bcf.agnostic.extensions.get_extensions_attributes(extensions)
            xsd_to_attrs = {v.subattr_xsd_name: k for k, v in attrs.items()}
@@ -149,7 +148,7 @@ class BcfXml:
        return topics

    @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
        """
        Create a BcfXml object from a file.

@@ -173,7 +172,7 @@ class BcfXml:
        cls,
        project_name: Optional[str] = None,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
        """
        Create a new BcfXml object.

@@ -262,7 +261,7 @@ class BcfXml:
        )

    # region Deprecated methods
-    def new_project(self) -> BcfXml:
+    def new_project(self) -> "BcfXml":
        """Deprecated method."""
        warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
        return self.create_new()
@@ -36,10 +36,20 @@ from bcf.v2.model.visinfo import (

 __all__ = [
    "BimSnippet",
-    "BitmapFormat",
-    "ClippingPlane",
    "Comment",
    "CommentViewpoint",
+    "Header",
+    "HeaderFile",
+    "Markup",
+    "Topic",
+    "TopicDocumentReference",
+    "TopicRelatedTopic",
+    "ViewPoint",
+    "Project",
+    "ProjectExtension",
+    "Version",
+    "BitmapFormat",
+    "ClippingPlane",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -48,20 +58,10 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
-    "Header",
-    "HeaderFile",
    "Line",
-    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
-    "Project",
-    "ProjectExtension",
-    "Topic",
-    "TopicDocumentReference",
-    "TopicRelatedTopic",
-    "Version",
-    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmap",
@@ -14,20 +14,16 @@
 # Currently extensions support for v2 is only read-only.


-import sys
 from dataclasses import dataclass, field, fields
-from typing import Optional
+from typing import List, NamedTuple, Optional


-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
-
-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsPriorities:
    class Meta:
        global_type = False

-    priority: list[str] = field(
+    priority: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Priority",
@@ -39,12 +35,12 @@ class ExtensionsPriorities:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsSnippetTypes:
    class Meta:
        global_type = False

-    snippet_type: list[str] = field(
+    snippet_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "SnippetType",
@@ -56,12 +52,12 @@ class ExtensionsSnippetTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsStages:
    class Meta:
        global_type = False

-    stage: list[str] = field(
+    stage: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Stage",
@@ -73,12 +69,12 @@ class ExtensionsStages:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicLabels:
    class Meta:
        global_type = False

-    topic_label: list[str] = field(
+    topic_label: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicLabel",
@@ -90,12 +86,12 @@ class ExtensionsTopicLabels:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicStatuses:
    class Meta:
        global_type = False

-    topic_status: list[str] = field(
+    topic_status: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicStatus",
@@ -107,12 +103,12 @@ class ExtensionsTopicStatuses:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicTypes:
    class Meta:
        global_type = False

-    topic_type: list[str] = field(
+    topic_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicType",
@@ -124,12 +120,12 @@ class ExtensionsTopicTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsUsers:
    class Meta:
        global_type = False

-    user: list[str] = field(
+    user: List[str] = field(
        default_factory=list,
        metadata={
            "name": "UserIdType",
@@ -141,7 +137,7 @@ class ExtensionsUsers:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Extensions:
    topic_types: Optional[ExtensionsTopicTypes] = field(
        default=None,
@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import List, Optional

 from xsdata.models.datatype import XmlDateTime

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
    reference: str = field(
        metadata={
@@ -41,7 +38,7 @@ class BimSnippet:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
    class Meta:
        global_type = False
@@ -56,7 +53,7 @@ class CommentViewpoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFile:
    class Meta:
        global_type = False
@@ -112,7 +109,7 @@ class HeaderFile:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReference:
    class Meta:
        global_type = False
@@ -150,7 +147,7 @@ class TopicDocumentReference:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopic:
    class Meta:
        global_type = False
@@ -165,7 +162,7 @@ class TopicRelatedTopic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
    viewpoint: Optional[str] = field(
        default=None,
@@ -201,7 +198,7 @@ class ViewPoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
    date: XmlDateTime = field(
        metadata={
@@ -261,9 +258,9 @@ class Comment:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
-    file: list[HeaderFile] = field(
+    file: List[HeaderFile] = field(
        default_factory=list,
        metadata={
            "name": "File",
@@ -274,9 +271,9 @@ class Header:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
-    reference_link: list[str] = field(
+    reference_link: List[str] = field(
        default_factory=list,
        metadata={
            "name": "ReferenceLink",
@@ -308,7 +305,7 @@ class Topic:
            "namespace": "",
        },
    )
-    labels: list[str] = field(
+    labels: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Labels",
@@ -388,7 +385,7 @@ class Topic:
            "namespace": "",
        },
    )
-    document_reference: list[TopicDocumentReference] = field(
+    document_reference: List[TopicDocumentReference] = field(
        default_factory=list,
        metadata={
            "name": "DocumentReference",
@@ -396,7 +393,7 @@ class Topic:
            "namespace": "",
        },
    )
-    related_topic: list[TopicRelatedTopic] = field(
+    related_topic: List[TopicRelatedTopic] = field(
        default_factory=list,
        metadata={
            "name": "RelatedTopic",
@@ -428,7 +425,7 @@ class Topic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
    header: Optional[Header] = field(
        default=None,
@@ -446,7 +443,7 @@ class Markup:
            "required": True,
        }
    )
-    comment: list[Comment] = field(
+    comment: List[Comment] = field(
        default_factory=list,
        metadata={
            "name": "Comment",
@@ -454,7 +451,7 @@ class Markup:
            "namespace": "",
        },
    )
-    viewpoints: list[ViewPoint] = field(
+    viewpoints: List[ViewPoint] = field(
        default_factory=list,
        metadata={
            "name": "Viewpoints",
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
    name: Optional[str] = field(
        default=None,
@@ -24,7 +21,7 @@ class Project:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectExtension:
    project: Optional[Project] = field(
        default=None,
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Version:
    detailed_version: Optional[str] = field(
        default=None,
@@ -1,9 +1,6 @@
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


 class BitmapFormat(Enum):
@@ -11,7 +8,7 @@ class BitmapFormat(Enum):
    JPG = "JPG"


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
    originating_system: Optional[str] = field(
        default=None,
@@ -38,7 +35,7 @@ class Component:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
    x: float = field(
        metadata={
@@ -63,7 +60,7 @@ class Direction:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
    x: float = field(
        metadata={
@@ -88,7 +85,7 @@ class Point:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
    spaces_visible: Optional[bool] = field(
        default=None,
@@ -113,7 +110,7 @@ class ViewSetupHints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
    location: Point = field(
        metadata={
@@ -131,12 +128,12 @@ class ClippingPlane:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -154,9 +151,9 @@ class ComponentColoringColor:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -166,12 +163,12 @@ class ComponentSelection:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -181,7 +178,7 @@ class ComponentVisibilityExceptions:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
    start_point: Point = field(
        metadata={
@@ -199,7 +196,7 @@ class Line:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
    """
    Attributes
@@ -239,7 +236,7 @@ class OrthogonalCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
    """
    Attributes
@@ -284,7 +281,7 @@ class PerspectiveCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmap:
    class Meta:
        global_type = False
@@ -333,9 +330,9 @@ class VisualizationInfoBitmap:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
-    color: list[ComponentColoringColor] = field(
+    color: List[ComponentColoringColor] = field(
        default_factory=list,
        metadata={
            "name": "Color",
@@ -345,7 +342,7 @@ class ComponentColoring:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
    exceptions: Optional[ComponentVisibilityExceptions] = field(
        default=None,
@@ -363,12 +360,12 @@ class ComponentVisibility:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
    class Meta:
        global_type = False

-    clipping_plane: list[ClippingPlane] = field(
+    clipping_plane: List[ClippingPlane] = field(
        default_factory=list,
        metadata={
            "name": "ClippingPlane",
@@ -377,12 +374,12 @@ class VisualizationInfoClippingPlanes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
    class Meta:
        global_type = False

-    line: list[Line] = field(
+    line: List[Line] = field(
        default_factory=list,
        metadata={
            "name": "Line",
@@ -392,7 +389,7 @@ class VisualizationInfoLines:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
    view_setup_hints: Optional[ViewSetupHints] = field(
        default=None,
@@ -424,7 +421,7 @@ class Components:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
    """
    VisualizationInfo documentation.
@@ -465,7 +462,7 @@ class VisualizationInfo:
            "type": "Element",
        },
    )
-    bitmap: list[VisualizationInfoBitmap] = field(
+    bitmap: List[VisualizationInfoBitmap] = field(
        default_factory=list,
        metadata={
            "name": "Bitmap",
@@ -1,6 +1,5 @@
 """BCF XML V2 Topic handler."""

-from __future__ import annotations
 import datetime
 import tempfile
 import uuid
@@ -153,7 +152,7 @@ class TopicHandler:
        topic_type: str = "",
        topic_status: str = "",
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
        """
        Create a new BCF topic.

@@ -1,7 +1,6 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from typing import Any, Iterable, Optional, Literal, Union

 import numpy as np
 from ifcopenshell import entity_instance
@@ -21,11 +21,11 @@ import http.server
 import os
 import tempfile
 import time
-import urllib.parse
+import urllib
 import uuid
 import webbrowser
 from re import A
-from typing import Any, Optional
+from typing import Any, Optional, Tuple

 import requests

@@ -40,7 +40,7 @@ class OAuthReceiver(http.server.BaseHTTPRequestHandler):
        self.send_response(200)
        self.send_header("Content-type", "text/plain")
        self.end_headers()
-        self.wfile.write(b"You have now authenticated :) You may now close this browser window.")
+        self.wfile.write("You have now authenticated :) You may now close this browser window.".encode("utf-8"))


 class FoundationClient:
@@ -174,7 +174,7 @@ class BcfClient:
        except requests.exceptions.HTTPError as e:
            print(f"message: {response.reason}'   '{response.status_code}'   '{ e }")

-    def post(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
+    def post(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -192,7 +192,7 @@ class BcfClient:
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

-    def put(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
+    def put(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -210,7 +210,7 @@ class BcfClient:
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

-    def delete(self, endpoint: str, params: Any = None) -> tuple[int, str]:
+    def delete(self, endpoint: str, params: Any = None) -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/json",
@@ -237,7 +237,7 @@ class BcfClient:
            },
        )

-    def update_project(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
+    def update_project(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
        url = f"{self.baseurl}/projects/{project_id}"
        headers = {"Authorization": f"Bearer {self.foundation_client.get_access_token()}"}
        resp = requests.put(url, headers=headers, data=data)
@@ -276,16 +276,16 @@ class BcfClient:
            },
        )

-    def create_topic(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
+    def create_topic(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.post(f"/projects/{project_id}/topics", data=data)

-    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
+    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.put(f"/projects/{project_id}/topics/{topic_id}", data=data)

-    def delete_topic(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
+    def delete_topic(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
        return self.delete(f"/projects/{project_id}/topics/{topic_id}")

-    def get_snippet(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
+    def get_snippet(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/octet-stream",
@@ -332,7 +332,7 @@ class BcfClient:
        topic_id: str = "",
        data: Any = None,
        params: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/files",
            data=data,
@@ -347,7 +347,7 @@ class BcfClient:
        topic_id: str = "",
        data: Any = None,
        params: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/comments",
            data=data,
@@ -363,7 +363,7 @@ class BcfClient:
            },
        )

-    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> tuple[int, str]:
+    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> Tuple[int, str]:
        return self.delete(f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}")

    def update_comment(
@@ -372,7 +372,7 @@ class BcfClient:
        topic_id: str = "",
        comment_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}",
            data=data,
@@ -387,7 +387,7 @@ class BcfClient:
            },
        )

-    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
+    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/viewpoints",
            data=data,
@@ -408,7 +408,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        viewpoint_id: str = "",
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.delete(
            f"/projects/{project_id}/topics/{topic_id}/viewpoints/{viewpoint_id}",
        )
@@ -478,7 +478,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/related_topics",
            data=data,
@@ -498,7 +498,7 @@ class BcfClient:
        project_id: str = "",
        topic_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.post(
            f"/projects/{project_id}/topics/{topic_id}/document_references",
            data=data,
@@ -510,7 +510,7 @@ class BcfClient:
        topic_id: str = "",
        document_reference_id: str = "",
        data: Any = None,
-    ) -> tuple[int, str]:
+    ) -> Tuple[int, str]:
        return self.put(
            f"/projects/{project_id}/topics/{topic_id}/document_references/{document_reference_id}",
            data=data,
@@ -543,7 +543,7 @@ class BcfClient:

        return response.status_code

-    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> tuple[int, str]:
+    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> Tuple[int, str]:
        headers = {
            "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
            "Content-type": "application/octet-stream",
@@ -1,6 +1,5 @@
 """BCF XML V3 handlers."""

-from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -31,7 +30,7 @@ class BcfXml:
        self._documents: Optional[DocumentsHandler] = None
        self._zip_file = self._load_zip_file()

-    def __enter__(self) -> BcfXml:
+    def __enter__(self) -> "BcfXml":
        return self

    def __exit__(self, *args: Any) -> None:
@@ -117,7 +116,7 @@ class BcfXml:
        return self._documents

    @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
        """
        Create a BcfXml object from a file.

@@ -142,7 +141,7 @@ class BcfXml:
        project_name: Optional[str] = None,
        extensions: Optional[mdl.Extensions] = None,
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> BcfXml:
+    ) -> "BcfXml":
        """
        Create a new BcfXml object.

@@ -240,7 +239,7 @@ class BcfXml:
        )

    # region Deprecated methods
-    def new_project(self) -> BcfXml:
+    def new_project(self) -> "BcfXml":
        """Deprecated method."""
        warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
        return self.create_new()
@@ -55,12 +55,40 @@ from bcf.v3.model.visinfo import (
 )

 __all__ = [
+    "Document",
+    "DocumentInfo",
+    "DocumentInfoDocuments",
+    "Extensions",
+    "ExtensionsPriorities",
+    "ExtensionsSnippetTypes",
+    "ExtensionsStages",
+    "ExtensionsTopicLabels",
+    "ExtensionsTopicStatuses",
+    "ExtensionsTopicTypes",
+    "ExtensionsUsers",
    "BimSnippet",
+    "Comment",
+    "CommentViewpoint",
+    "DocumentReference",
+    "File",
+    "Header",
+    "HeaderFiles",
+    "Markup",
+    "Topic",
+    "TopicComments",
+    "TopicDocumentReferences",
+    "TopicLabels",
+    "TopicReferenceLinks",
+    "TopicRelatedTopics",
+    "TopicRelatedTopicsRelatedTopic",
+    "TopicViewpoints",
+    "ViewPoint",
+    "Project",
+    "ProjectInfo",
+    "Version",
    "Bitmap",
    "BitmapFormat",
    "ClippingPlane",
-    "Comment",
-    "CommentViewpoint",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -70,38 +98,10 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
-    "Document",
-    "DocumentInfo",
-    "DocumentInfoDocuments",
-    "DocumentReference",
-    "Extensions",
-    "ExtensionsPriorities",
-    "ExtensionsSnippetTypes",
-    "ExtensionsStages",
-    "ExtensionsTopicLabels",
-    "ExtensionsTopicStatuses",
-    "ExtensionsTopicTypes",
-    "ExtensionsUsers",
-    "File",
-    "Header",
-    "HeaderFiles",
    "Line",
-    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
-    "Project",
-    "ProjectInfo",
-    "Topic",
-    "TopicComments",
-    "TopicDocumentReferences",
-    "TopicLabels",
-    "TopicReferenceLinks",
-    "TopicRelatedTopics",
-    "TopicRelatedTopicsRelatedTopic",
-    "TopicViewpoints",
-    "Version",
-    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmaps",
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Document:
    filename: str = field(
        metadata={
@@ -37,12 +34,12 @@ class Document:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfoDocuments:
    class Meta:
        global_type = False

-    document: list[Document] = field(
+    document: List[Document] = field(
        default_factory=list,
        metadata={
            "name": "Document",
@@ -52,7 +49,7 @@ class DocumentInfoDocuments:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentInfo:
    documents: Optional[DocumentInfoDocuments] = field(
        default=None,
@@ -1,16 +1,13 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsPriorities:
    class Meta:
        global_type = False

-    priority: list[str] = field(
+    priority: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Priority",
@@ -22,12 +19,12 @@ class ExtensionsPriorities:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsSnippetTypes:
    class Meta:
        global_type = False

-    snippet_type: list[str] = field(
+    snippet_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "SnippetType",
@@ -39,12 +36,12 @@ class ExtensionsSnippetTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsStages:
    class Meta:
        global_type = False

-    stage: list[str] = field(
+    stage: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Stage",
@@ -56,12 +53,12 @@ class ExtensionsStages:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicLabels:
    class Meta:
        global_type = False

-    topic_label: list[str] = field(
+    topic_label: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicLabel",
@@ -73,12 +70,12 @@ class ExtensionsTopicLabels:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicStatuses:
    class Meta:
        global_type = False

-    topic_status: list[str] = field(
+    topic_status: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicStatus",
@@ -90,12 +87,12 @@ class ExtensionsTopicStatuses:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsTopicTypes:
    class Meta:
        global_type = False

-    topic_type: list[str] = field(
+    topic_type: List[str] = field(
        default_factory=list,
        metadata={
            "name": "TopicType",
@@ -107,12 +104,12 @@ class ExtensionsTopicTypes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ExtensionsUsers:
    class Meta:
        global_type = False

-    user: list[str] = field(
+    user: List[str] = field(
        default_factory=list,
        metadata={
            "name": "User",
@@ -124,7 +121,7 @@ class ExtensionsUsers:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Extensions:
    topic_types: Optional[ExtensionsTopicTypes] = field(
        default=None,
@@ -1,13 +1,10 @@
-import sys
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import List, Optional

 from xsdata.models.datatype import XmlDateTime

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class BimSnippet:
    reference: str = field(
        metadata={
@@ -47,7 +44,7 @@ class BimSnippet:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class CommentViewpoint:
    class Meta:
        global_type = False
@@ -62,7 +59,7 @@ class CommentViewpoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class DocumentReference:
    document_guid: Optional[str] = field(
        default=None,
@@ -103,7 +100,7 @@ class DocumentReference:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class File:
    filename: Optional[str] = field(
        default=None,
@@ -160,12 +157,12 @@ class File:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicLabels:
    class Meta:
        global_type = False

-    label: list[str] = field(
+    label: List[str] = field(
        default_factory=list,
        metadata={
            "name": "Label",
@@ -177,12 +174,12 @@ class TopicLabels:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicReferenceLinks:
    class Meta:
        global_type = False

-    reference_link: list[str] = field(
+    reference_link: List[str] = field(
        default_factory=list,
        metadata={
            "name": "ReferenceLink",
@@ -194,7 +191,7 @@ class TopicReferenceLinks:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopicsRelatedTopic:
    class Meta:
        global_type = False
@@ -209,7 +206,7 @@ class TopicRelatedTopicsRelatedTopic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewPoint:
    viewpoint: Optional[str] = field(
        default=None,
@@ -249,7 +246,7 @@ class ViewPoint:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Comment:
    date: XmlDateTime = field(
        metadata={
@@ -315,12 +312,12 @@ class Comment:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class HeaderFiles:
    class Meta:
        global_type = False

-    file: list[File] = field(
+    file: List[File] = field(
        default_factory=list,
        metadata={
            "name": "File",
@@ -330,12 +327,12 @@ class HeaderFiles:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicDocumentReferences:
    class Meta:
        global_type = False

-    document_reference: list[DocumentReference] = field(
+    document_reference: List[DocumentReference] = field(
        default_factory=list,
        metadata={
            "name": "DocumentReference",
@@ -345,12 +342,12 @@ class TopicDocumentReferences:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicRelatedTopics:
    class Meta:
        global_type = False

-    related_topic: list[TopicRelatedTopicsRelatedTopic] = field(
+    related_topic: List[TopicRelatedTopicsRelatedTopic] = field(
        default_factory=list,
        metadata={
            "name": "RelatedTopic",
@@ -360,12 +357,12 @@ class TopicRelatedTopics:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicViewpoints:
    class Meta:
        global_type = False

-    view_point: list[ViewPoint] = field(
+    view_point: List[ViewPoint] = field(
        default_factory=list,
        metadata={
            "name": "ViewPoint",
@@ -375,7 +372,7 @@ class TopicViewpoints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Header:
    files: Optional[HeaderFiles] = field(
        default=None,
@@ -387,12 +384,12 @@ class Header:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class TopicComments:
    class Meta:
        global_type = False

-    comment: list[Comment] = field(
+    comment: List[Comment] = field(
        default_factory=list,
        metadata={
            "name": "Comment",
@@ -402,7 +399,7 @@ class TopicComments:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Topic:
    reference_links: Optional[TopicReferenceLinks] = field(
        default=None,
@@ -599,7 +596,7 @@ class Topic:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Markup:
    header: Optional[Header] = field(
        default=None,
@@ -1,11 +1,8 @@
-import sys
 from dataclasses import dataclass, field
 from typing import Optional

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Project:
    name: Optional[str] = field(
        default=None,
@@ -28,7 +25,7 @@ class Project:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ProjectInfo:
    project: Project = field(
        metadata={
@@ -1,10 +1,7 @@
-import sys
 from dataclasses import dataclass, field

-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}

-
-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Version:
    version_id: str = field(
        metadata={
@@ -1,10 +1,6 @@
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Optional
-
-
-DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+from typing import List, Optional


 class BitmapFormat(Enum):
@@ -12,7 +8,7 @@ class BitmapFormat(Enum):
    JPG = "jpg"


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Component:
    originating_system: Optional[str] = field(
        default=None,
@@ -43,7 +39,7 @@ class Component:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Direction:
    x: float = field(
        metadata={
@@ -68,7 +64,7 @@ class Direction:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Point:
    x: float = field(
        metadata={
@@ -93,7 +89,7 @@ class Point:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ViewSetupHints:
    spaces_visible: bool = field(
        default=False,
@@ -118,7 +114,7 @@ class ViewSetupHints:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Bitmap:
    format: BitmapFormat = field(
        metadata={
@@ -166,7 +162,7 @@ class Bitmap:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ClippingPlane:
    location: Point = field(
        metadata={
@@ -184,12 +180,12 @@ class ClippingPlane:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColorComponents:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -199,9 +195,9 @@ class ComponentColoringColorComponents:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentSelection:
-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -210,12 +206,12 @@ class ComponentSelection:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibilityExceptions:
    class Meta:
        global_type = False

-    component: list[Component] = field(
+    component: List[Component] = field(
        default_factory=list,
        metadata={
            "name": "Component",
@@ -224,7 +220,7 @@ class ComponentVisibilityExceptions:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Line:
    start_point: Point = field(
        metadata={
@@ -242,7 +238,7 @@ class Line:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class OrthogonalCamera:
    """
    Attributes
@@ -292,7 +288,7 @@ class OrthogonalCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class PerspectiveCamera:
    """
    Attributes
@@ -348,7 +344,7 @@ class PerspectiveCamera:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoringColor:
    class Meta:
        global_type = False
@@ -370,7 +366,7 @@ class ComponentColoringColor:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentVisibility:
    view_setup_hints: Optional[ViewSetupHints] = field(
        default=None,
@@ -395,12 +391,12 @@ class ComponentVisibility:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoBitmaps:
    class Meta:
        global_type = False

-    bitmap: list[Bitmap] = field(
+    bitmap: List[Bitmap] = field(
        default_factory=list,
        metadata={
            "name": "Bitmap",
@@ -409,12 +405,12 @@ class VisualizationInfoBitmaps:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoClippingPlanes:
    class Meta:
        global_type = False

-    clipping_plane: list[ClippingPlane] = field(
+    clipping_plane: List[ClippingPlane] = field(
        default_factory=list,
        metadata={
            "name": "ClippingPlane",
@@ -423,12 +419,12 @@ class VisualizationInfoClippingPlanes:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfoLines:
    class Meta:
        global_type = False

-    line: list[Line] = field(
+    line: List[Line] = field(
        default_factory=list,
        metadata={
            "name": "Line",
@@ -437,9 +433,9 @@ class VisualizationInfoLines:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class ComponentColoring:
-    color: list[ComponentColoringColor] = field(
+    color: List[ComponentColoringColor] = field(
        default_factory=list,
        metadata={
            "name": "Color",
@@ -448,7 +444,7 @@ class ComponentColoring:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class Components:
    selection: Optional[ComponentSelection] = field(
        default=None,
@@ -473,7 +469,7 @@ class Components:
    )


-@dataclass(**DATACLASS_KWARGS)
+@dataclass(slots=True, kw_only=True)
 class VisualizationInfo:
    """
    VisualizationInfo documentation.
@@ -1,6 +1,5 @@
 """BCF XML V3 Topic handler."""

-from __future__ import annotations
 import datetime
 import uuid
 import zipfile
@@ -92,12 +91,12 @@ class TopicHandler:
        self._bim_snippet = value

    @property
-    def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+    def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
        if self._viewpoints is None:
            self._viewpoints = self._load_viewpoints()
        return self._viewpoints

-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+    def _load_viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
        if self._topic_dir and self.topic.viewpoints and (viewpoints := self.topic.viewpoints.view_point):
            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
        return {}
@@ -140,7 +139,7 @@ class TopicHandler:
        topic_type: str = "",
        topic_status: str = "",
        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> TopicHandler:
+    ) -> "TopicHandler":
        """
        Create a new BCF topic.

@@ -1,7 +1,6 @@
 import uuid
 import zipfile
-from typing import Any, Optional, Literal, Union
-from collections.abc import Iterable
+from typing import Any, Iterable, Optional, Literal, Union

 import numpy as np
 from ifcopenshell import entity_instance
@@ -1,6 +1,6 @@
 """XML Parser and Serializer factories."""

-from typing import Optional, Protocol, TypeVar
+from typing import Optional, Protocol, Type, TypeVar

 from xsdata.formats.dataclass.context import XmlContext
 from xsdata.formats.dataclass.parsers import XmlParser
@@ -29,7 +29,7 @@ T = TypeVar("T")
 class AbstractXmlParserSerializer(Protocol):
    """XML Parser and serializer wrapper."""

-    def parse(self, xml: bytes, clazz: type[T]) -> T:
+    def parse(self, xml: bytes, clazz: Type[T]) -> T:
        """
        Parse an XML file to an object.

@@ -61,7 +61,7 @@ class XmlParserSerializer:
        self.parser = build_xml_parser(self.context)
        self.serializer = build_serializer(self.context)

-    def parse(self, xml: bytes, clazz: type[T]) -> T:
+    def parse(self, xml: bytes, clazz: Type[T]) -> T:
        """
        Parse an XML file to an object.

@@ -16,7 +16,6 @@ dependencies = [
    "xsdata>=24.4",
    "numpy",
    "ifcopenshell",
-    "requests",
 ]
 version = "0.0.0"
 classifiers = [
@@ -87,7 +87,7 @@ BLENDER_PLATFORM:=windows-x64
 endif

 # Current build commit hash.
-OLD:=e795cec
+OLD:=c49ca69
 .PHONY: bump
 bump:
 ifndef NEW
@@ -138,7 +138,7 @@ endif
 	# odfpy doesn't come with its own wheel, so whee'l (get it?) create it ourselves!
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel odfpy --wheel-dir=./wheels
 	# Required by IFCCityJSON
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "cjio >=0.8, <0.10" --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --dest=./wheels
 	# Required in general for sorting all sorts of stuff in a nice way
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download natsort --dest=./wheels
 	# Provides express rule validation for ifcopenshell.validate
@@ -192,18 +192,14 @@ else ifeq ($(PLATFORM), macos)
 else
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 endif
-	# Required by ifctester web ui.
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download flask $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
-
-	# jQuery is required for web UI functionality
-	cd build/bonsai/bim/data/webui/static/js/ && wget https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js

 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
 	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
 	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css

 	# Provides IFCJSON functionality
-	cd build && wget -O ifc2json.zip https://github.com/IFCJSON-Team/IFC2JSON_python/archive/refs/heads/master.zip
+	# TODO: replace with main repo if https://github.com/IFCJSON-Team/IFC2JSON_python/pull/3 is merged.
+	cd build && wget -O ifc2json.zip https://github.com/Moult/IFC2JSON_python/archive/refs/heads/feature-ios-v0.8.0.zip
 	cd build && unzip ifc2json.zip && rm ifc2json.zip
 	# IFCJSON doesn't have pyproject.toml, so we use python command.
 	cd build && . env/$(VENV_ACTIVATE) && cd IFC2JSON_python-*/file_converters && \
@@ -40,8 +40,7 @@ import uuid
 import shutil
 from collections import deque
 from pathlib import Path
-from typing import Union, Any
-from collections.abc import Generator
+from typing import Union, Any, Generator


 last_commit_hash = "8888888"
@@ -22,8 +22,7 @@ import bpy.utils.previews
 import importlib
 from bpy_extras.io_utils import ImportHelper, ExportHelper
 from . import handler, ui, prop, operator
-from typing import Union
-from collections.abc import Callable
+from typing import Callable, Union

 try:
    from bonsai.translations import translations_dict
@@ -97,6 +96,7 @@ for name in modules.keys():


 classes = [
+    operator.AddIfcFile,
    operator.BIM_OT_add_section_plane,
    operator.BIM_OT_delete_object,
    operator.BIM_OT_remove_section_plane,
@@ -105,12 +105,9 @@ classes = [
    operator.BIM_OT_select_object,
    operator.BIM_OT_show_description,
    operator.BIM_OT_multiple_file_selector,
-    operator.BIM_OT_attribute_add_subitem,
-    operator.BIM_OT_attribute_remove_subitem,
    operator.ClippingPlaneCutWithCappings,
    operator.CloseBlendWarning,
    operator.CloseError,
-    operator.CreateMacBonsaiApp,
    operator.CopyTextToClipboard,
    operator.EditBlenderCollection,
    operator.FileAssociate,
@@ -119,6 +116,7 @@ classes = [
    operator.OpenUpstream,
    operator.OpenUri,
    operator.ReloadIfcFile,
+    operator.RemoveIfcFile,
    operator.RevertClippingPlaneCut,
    operator.SelectDir,
    operator.SelectIfcFile,
@@ -128,16 +126,15 @@ classes = [
    operator.ShowSystemInfo,
    prop.StrProperty,
    operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
-    operator.BIM_OT_attribute_search_values,
    prop.ObjProperty,
    prop.MultipleFileSelect,
    prop.Attribute,
-    prop.ISODuration,
    prop.BIMAreaProperties,
    prop.BIMTabProperties,
    prop.BIMProperties,
    prop.IfcParameter,
    prop.PsetQto,
+    prop.GlobalId,
    prop.BIMObjectProperties,
    prop.BIMCollectionProperties,
    prop.BIMMeshProperties,
@@ -147,7 +144,7 @@ classes = [
    prop.BIMSnapGroups,
    ui.BIM_UL_clipping_plane,
    ui.BIM_UL_generic,
-    ui.DocPreferences,
+    ui.BIM_UL_topics,
    ui.BIM_ADDON_preferences,
    # Tabs panel
    ui.BIM_PT_tabs,
@@ -155,10 +152,10 @@ classes = [
    ui.BIM_PT_tab_new_project_wizard,
    ui.BIM_PT_tab_project_info,
    ui.BIM_PT_tab_spatial,
-    ui.BIM_PT_tab_grouping_and_filtering,
    ui.BIM_PT_tab_project_setup,
    ui.BIM_PT_tab_geometry,
    ui.BIM_PT_tab_stakeholders,
+    ui.BIM_PT_tab_grouping_and_filtering,
    # Object information
    ui.BIM_PT_tab_object_metadata,
    ui.BIM_PT_tab_misc,
@@ -499,10 +499,6 @@
                0.05087608844041824,
                0.05087608844041824
            ],
-            "scene.eevee.use_shadows": true,
-            "scene.eevee.shadow_ray_count": 1,
-            "scene.eevee.shadow_step_count": 6,
-            "scene.eevee.shadow_resolution_scale": 1.0,
            "scene.render.bake_bias": 0.0010000000474974513,
            "scene.render.bake_margin": 16,
            "scene.render.bake_margin_type": "ADJACENT_FACES",
@@ -1 +0,0 @@
-SVG [mustache](https://mustache.github.io/) templates that will be used for sheets and fill be filled with infromation from the sheet's IfcDocumentInformation attributes (e.g. Identification, Name, Revision, etc).
@@ -21,7 +21,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -19,7 +19,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -24,7 +24,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -17,7 +17,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -21,7 +21,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -74,12 +74,16 @@ class IfcExporter:
                    json.dump(jsonData, outfile, indent=None if self.ifc_export_settings.json_compact else 4)

    def set_header(self):
-        self.file.header.file_name.name = os.path.basename(self.ifc_export_settings.output_file)
-        self.file.header.file_name.time_stamp = (
-            datetime.datetime.utcnow().replace(tzinfo=datetime.UTC).astimezone().replace(microsecond=0).isoformat()
+        self.file.wrapped_data.header.file_name.name = os.path.basename(self.ifc_export_settings.output_file)
+        self.file.wrapped_data.header.file_name.time_stamp = (
+            datetime.datetime.utcnow()
+            .replace(tzinfo=datetime.timezone.utc)
+            .astimezone()
+            .replace(microsecond=0)
+            .isoformat()
        )
-        self.file.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
-        self.file.header.file_name.originating_system = "{} {}".format(
+        self.file.wrapped_data.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
+        self.file.wrapped_data.header.file_name.originating_system = "{} {}".format(
            self.get_application_name(), tool.Blender.get_bonsai_version()
        )

@@ -139,10 +143,6 @@ class IfcExporter:


 class IfcExportSettings:
-    """
-    Initialize only using `IfcExportSettings.factory()`.
-    """
-
    def __init__(self):
        self.logger: Logger = None
        self.output_file: str = None
@@ -24,18 +24,16 @@ import ifcopenshell.util.unit
 import ifcopenshell.api.owner.settings
 import bonsai.bim
 import bonsai.tool as tool
-import weakref
 from bpy.app.handlers import persistent
 from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.model.data import AuthoringData
 from bonsai.bim.module.aggregate.decorator import AggregateDecorator
 from bonsai.bim.module.georeference.decorator import GeoreferenceDecorator
-from bonsai.bim.module.model.decorator import WallAxisDecorator, SlabDirectionDecorator, BoundingBoxDecorator
+from bonsai.bim.module.model.decorator import WallAxisDecorator, SlabDirectionDecorator
 from bonsai.bim.module.nest.decorator import NestDecorator
 from mathutils import Vector
 from math import cos
-from typing import Union
-from collections.abc import Callable
+from typing import Union, Callable


 cwd = os.path.dirname(os.path.realpath(__file__))
@@ -219,12 +217,12 @@ def refresh_ui_data():
        except AttributeError:
            pass

-    if isinstance(ifc_file := tool.Ifc.get(), ifcopenshell.sqlite):
-        ifc_file.clear_cache()
+    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
+        tool.Ifc.get().clear_cache()

    props = tool.Drawing.get_document_props()
    props.should_draw_decorations = props.should_draw_decorations
-    if tool.Web.get_web_props().is_connected:
+    if bpy.context.scene.WebProperties.is_connected:
        tool.Web.send_webui_data()


@@ -258,73 +256,31 @@ def redo_post(scene: bpy.types.Scene) -> None:
    tool.Ifc.rebuild_element_maps()


-# Cache is important as those entities will be retrieved very often,
-# for every IfcOwnerHistory creation or update.
-class SettingsCache:
-    APPLICATION_ID: Union[int, None] = None
-    USER_ID: Union[int, None] = None
-
-    _file: Union[weakref.ReferenceType[ifcopenshell.file], None] = None
-
-    @classmethod
-    def get_file(cls) -> Union[ifcopenshell.file, None]:
-        if cls._file is None:
-            return None
-        return cls._file()
-
-    @classmethod
-    def set_file(cls, file: ifcopenshell.file) -> None:
-        cls._file = weakref.ref(file)
-
-
 def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
-    if SettingsCache.get_file() is ifc and SettingsCache.APPLICATION_ID is not None:
-        try:
-            app = ifc.by_id(SettingsCache.APPLICATION_ID)
-            return app
-        except RuntimeError:
-            pass
-
-    # Use only main part from the version to avoid flooding advanced users projects with IfcApplications.
-    version = tool.Blender.get_bonsai_version().split("-")[0]
-    identifier = f"Bonsai-{version}"
+    # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
+    version = tool.Blender.get_bonsai_version()
    for element in ifc.by_type("IfcApplication"):
-        if element.ApplicationIdentifier == identifier:
+        if element.ApplicationIdentifier == "Bonsai" and element.Version == version:
            return element
-    application_developer = next((org for org in ifc.by_type("IfcOrganization") if org.Name == "IfcOpenShell"), None)
-    application = ifcopenshell.api.owner.add_application(
+    return ifcopenshell.api.run(
+        "owner.add_application",
        ifc,
-        application_developer=application_developer,
        version=version,
        application_full_name="Bonsai",
-        application_identifier=identifier,
+        application_identifier="Bonsai",
    )
-    SettingsCache.APPLICATION_ID = application.id()
-    SettingsCache.set_file(ifc)
-    return application


 def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None]:
    # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
-    if SettingsCache.get_file() is ifc and SettingsCache.USER_ID is not None:
-        try:
-            user = ifc.by_id(SettingsCache.USER_ID)
-            return user
-        except RuntimeError:
-            pass
-
    if pao := next(iter(ifc.by_type("IfcPersonAndOrganization")), None):
-        SettingsCache.USER_ID = pao.id()
-        SettingsCache.set_file(ifc)
        return pao
    elif ifc.schema == "IFC2X3":
        if (person := next(iter(ifc.by_type("IfcPerson")), None)) is None:
-            person = ifcopenshell.api.owner.add_person(ifc)
+            person = tool.Ifc.run("owner.add_person")
        if (organization := next(iter(ifc.by_type("IfcOrganization")), None)) is None:
-            organization = ifcopenshell.api.owner.add_organisation(ifc)
-        pao = ifcopenshell.api.owner.add_person_and_organisation(ifc, person=person, organisation=organization)
-        SettingsCache.USER_ID = pao.id()
-        SettingsCache.set_file(ifc)
+            organization = tool.Ifc.run("owner.add_organisation")
+        pao = tool.Ifc.run("owner.add_person_and_organisation", person=person, organisation=organization)
        return pao


@@ -394,11 +350,6 @@ def load_post(scene):
    aggregate_props = tool.Aggregate.get_aggregate_props()
    nest_props = tool.Nest.get_nest_props()
    model_props = tool.Model.get_model_props()
-    GeoreferenceDecorator.uninstall()
-    AggregateDecorator.uninstall()
-    NestDecorator.uninstall()
-    WallAxisDecorator.uninstall()
-    SlabDirectionDecorator.uninstall()
    if georeference_props.should_visualise:
        GeoreferenceDecorator.install(bpy.context)
    if aggregate_props.aggregate_decorator:
@@ -409,13 +360,9 @@ def load_post(scene):
        WallAxisDecorator.install(bpy.context)
    if model_props.show_slab_direction:
        SlabDirectionDecorator.install(bpy.context)
-    if model_props.show_bounding_box:
-        BoundingBoxDecorator.install(bpy.context)

    if preferences.should_use_snap and (scene := bpy.context.scene):
        # Snapping is off by default in Blender, but in BIM, it's more useful to be on
        scene.tool_settings.use_snap = True
        # Match default Bonsai snaps
        scene.tool_settings.snap_elements_base = {"EDGE", "EDGE_PERPENDICULAR", "VERTEX", "EDGE_MIDPOINT", "FACE"}
-
-    tool.Blender.sync_old_preferences()
@@ -27,9 +27,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.unit
 from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
 import bonsai.tool as tool
-from types import EllipsisType
-from typing import Optional, Any, Union, TYPE_CHECKING
-from collections.abc import Callable, Iterable, Sequence
+from typing import Optional, Callable, Any, Union, Iterable, TYPE_CHECKING

 if TYPE_CHECKING:
    import bonsai.bim.prop
@@ -40,9 +38,6 @@ if TYPE_CHECKING:
    # - None  - property should be imported by default workflow
    # - True  - setting value for imported attribute should be skipped
    # - False - property should be skipped entirely from import
-    # Second argument is optional,
-    # because ImportCallback might be called for attributes that are not created by default
-    # (e.g. IFC entity attributes).
    ImportCallback = Callable[[str, Optional[bonsai.bim.prop.Attribute], dict[str, Any]], Union[bool, None]]
    # ExportCallback return values:
    # - True  - property should be skipped entirely from export
@@ -51,67 +46,36 @@ if TYPE_CHECKING:


 def draw_attributes(
-    props: Union[bpy.types.bpy_prop_collection_idprop[Attribute], Sequence[Attribute]],
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
    layout: bpy.types.UILayout,
    copy_operator: Optional[str] = None,
    popup_active_attribute: Optional[bonsai.bim.prop.Attribute] = None,
    callback: Optional[Callable[[bonsai.bim.prop.Attribute, bpy.types.UILayout], None]] = None,
-    *,
-    enable_search: Union[bool, EllipsisType] = ...,
 ) -> None:
    """Draw editable UI for prop.Attributes.

    You can set attribute active in popup with `active_attribute`
    meaning you will be able to type into attribute's field without having to click
    on it first
-
-    :param enable_search: Add search button to string, integer, and float attributes
-        Possible values:
-
-        - ``...`` (default value) -
-            add search if possible. If it's not possible, there will be no warnings or errors.
-        - ``True`` - always add search, if it's not possible it will result in errors.
-        - ``False`` - never add search.
-
    """
    for attribute in props:
        row = layout.row(align=True)
        if attribute == popup_active_attribute:
            row.activate_init = True
-        draw_attribute(attribute, row, copy_operator, enable_search=enable_search)
+        draw_attribute(attribute, row, copy_operator)
        if callback:
            callback(attribute, row)


 def draw_attribute(
-    attribute: bonsai.bim.prop.Attribute,
-    layout: bpy.types.UILayout,
-    copy_operator: Optional[str] = None,
-    enable_search: Union[bool, EllipsisType] = ...,
+    attribute: bonsai.bim.prop.Attribute, layout: bpy.types.UILayout, copy_operator: Optional[str] = None
 ) -> None:
    value_name = attribute.get_value_name(display_only=True)
-
    if value_name == "enum_value":
        prop_with_search(layout, attribute, "enum_value", text=attribute.name)
    elif value_name == "filepath_value":
        attribute.filepath_value.layout_file_select(layout, filter_glob=attribute.filter_glob, text=attribute.name)
-
-    elif value_name == "subitems_values":
-        col = layout.column()
-        layout = col.row(align=True)
-        layout.label(text=f"{attribute.name}:")
-        data_path = tool.Blender.get_full_data_path(attribute, value_name)
-        for i, item in enumerate(attribute.subitems_values, 1):
-            row = col.row(align=True)
-            row.alignment = "EXPAND"
-            row.prop(item, "name", text=f"# {i}")
-            op = row.operator("bim.attribute_remove_subitem", text="", icon="X")
-            op.data_path = data_path
-            op.index = i - 1
-        op = layout.operator("bim.attribute_add_subitem", icon="ADD", text="")
-        op.data_path = data_path
-
-    elif attribute.special_type == "DURATION":
+    elif attribute.name in ("ScheduleDuration", "ActualDuration", "FreeFloat", "TotalFloat"):
        props = tool.Sequence.get_work_schedule_props()
        for item in props.durations_attributes:
            if item.name == attribute.name:
@@ -131,34 +95,17 @@ def draw_attribute(
            text=attribute.display_name,
        )

-    if attribute.special_type == "URI":
+    if attribute.is_uri:
        op = layout.operator("bim.select_uri_attribute", text="", icon="FILE_FOLDER")
-        op.attribute_data_path = tool.Blender.get_full_data_path(attribute)
+        op.data_path = attribute.path_from_id("string_value")
    elif attribute.special_type in ("DATE", "DATETIME"):
        op = layout.operator("bim.datepicker", text="", icon="TIME")
        op.target_prop = attribute.path_from_id("string_value")
        op.include_time = attribute.special_type == "DATETIME"

-    if attribute.data_type in ("string", "integer", "float") and (
-        enable_search is True or (enable_search is ... and attribute.ifc_class)
-    ):
-        op = layout.operator("bim.attribute_search_values", text="", icon="VIEWZOOM")
-        op.attribute_name = attribute.name
-        op.attribute_ifc_class = attribute.ifc_class
-        op.data_path = tool.Blender.get_full_data_path(attribute, value_name)
-        op.data_type = attribute.data_type
-
    if attribute.is_optional:
        layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")

-    if attribute.use_explorer_ui:
-        op = layout.operator("bim.explorer_show_ui_popup", text="", icon="ZOOM_SELECTED")
-        op.ifc_class = attribute.ifc_class
-        op.attribute_name = attribute.name
-        op.data_path = tool.Blender.get_full_data_path(attribute, value_name)
-        if ifc_id := attribute.get_value():
-            op.preselect_ifc_id = int(ifc_id)
-
    if attribute.name == "GlobalId":
        layout.operator("bim.generate_global_id", icon="FILE_REFRESH", text="")
    elif copy_operator:
@@ -167,22 +114,28 @@ def draw_attribute(


 def import_attributes(
+    ifc_class: str,
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
+    data: dict[str, Any],
+    callback: Optional[ImportCallback] = None,
+) -> None:
+    schema = tool.Ifc.schema()
+    for attribute in schema.declaration_by_name(ifc_class).all_attributes():
+        import_attribute(attribute, props, data, callback=callback)
+
+
+# A more elegant attribute importer signature, intended to supersede import_attributes
+def import_attributes2(
    element: Union[str, ifcopenshell.entity_instance],
    props: bpy.types.bpy_prop_collection_idprop[Attribute],
    callback: Optional[ImportCallback] = None,
 ) -> None:
-    """
-    :param element: Entity or IFC class string.
-    """
-    info: dict[str, Any]
    if isinstance(element, str):
-        assert (entity := tool.Ifc.schema().declaration_by_name(element).as_entity())
-        attributes = entity.all_attributes()
+        attributes = tool.Ifc.schema().declaration_by_name(element).as_entity().all_attributes()
        info = {a.name(): None for a in attributes}
        info["type"] = element
    else:
-        assert (entity := element.wrapped_data.declaration().as_entity())
-        attributes = entity.all_attributes()
+        attributes = element.wrapped_data.declaration().as_entity().all_attributes()
        info = element.get_info()
    for attribute in attributes:
        import_attribute(attribute, props, info, callback=callback)
@@ -196,19 +149,15 @@ def import_attribute(
 ) -> None:
    data_type = ifcopenshell.util.attribute.get_primitive_type(attribute)
    # Complex data types (aggregates and entities) are handled only by callback.
-    if data_type == ("list", "string"):
-        data_type = "list[string]"
    if isinstance(data_type, tuple) or data_type == "entity":
        callback(attribute.name(), None, data) if callback else None
        return
-
-    new = props.add()
+    new: bonsai.bim.prop.Attribute = props.add()
    new.name = attribute.name()
    new.is_null = data[attribute.name()] is None
    new.is_optional = attribute.optional()
    new.data_type = data_type if isinstance(data_type, str) else ""
    new.ifc_class = data["type"]
-
    is_handled_by_callback = callback(attribute.name(), new, data) if callback else None
    data_type = new.data_type  # Allow callback to override data type.

@@ -218,9 +167,8 @@ def import_attribute(
        props.remove(len(props) - 1)
    elif data_type == "string":
        new.string_value = "" if new.is_null else str(data[attribute.name()]).replace("\n", "\\n")
-        attribute_type = attribute.type_of_attribute()
-        if attribute_type._is("IfcURIReference"):
-            new.special_type = "URI"
+        if attribute.type_of_attribute().declared_type().name() == "IfcURIReference":
+            new.is_uri = True
        elif attribute.type_of_attribute()._is("IfcDate"):
            new.special_type = "DATE"
        elif attribute.type_of_attribute()._is("IfcDateTime"):
@@ -254,12 +202,6 @@ def import_attribute(

        if enum_value is not None:
            new.enum_value = enum_value
-    elif data_type == "list[string]":
-        value: Union[list[str], None] = data[attribute.name()]
-        if value:
-            for item in value:
-                new.subitems_values.add().name = str(item).replace("\n", "\\n")
-
    add_attribute_description(new, data)
    add_attribute_min_max(attribute, new)

@@ -296,13 +238,7 @@ def add_attribute_enum_items_descriptions(
        new_enum_description.name = description


-def add_attribute_description(
-    attribute_blender: bonsai.bim.prop.Attribute,
-    attribute_ifc: Union[ifcopenshell.entity_instance, None] = None,
-) -> None:
-    """
-    :param attribute_ifc: IFC Entity to use as a fallback source of description (using "Description" attribute).
-    """
+def add_attribute_description(attribute_blender: bonsai.bim.prop.Attribute, attribute_ifc=None):
    if not attribute_blender.name:
        return
    version = tool.Ifc.get_schema()
@@ -333,16 +269,6 @@ def export_attributes(
    return attributes


-def process_exported_entity_attribute(attributes: dict[str, Any], attribute_names: list[str]) -> None:
-    for attribute_name in attribute_names:
-        entity_id = attributes[attribute_name]
-        if entity_id is None:
-            # Maybe it was removed by now and enum is invalid.
-            del attributes[attribute_name]
-        else:
-            attributes[attribute_name] = tool.Ifc.get().by_id(int(entity_id))
-
-
 ENUM_ITEMS_DATA = Union[bpy.types.PropertyGroup, bpy.types.ID, bpy.types.Operator, bpy.types.OperatorProperties]


@@ -366,35 +292,22 @@ def prop_with_search(
    prop_name: str,
    should_click_ok: bool = False,
    original_operator_path: Optional[str] = None,
-    *,
-    enable_relating_type_suggestions: bool = False,
-    search_threshold: int = 10,
-    button_kwargs: Union[dict[str, Any], None] = None,
    **kwargs: Any,
 ) -> bpy.types.UILayout:
    """
-    Draw a row with enum prop and enum search operator.
-
-    Search operator appears only in case if there's more than `search_threshold` items in enum.
-
-    :arg button_kwargs: kwargs to pass to ``UILayout.operator()``.
-    :arg kwargs: kwargs to pass to ``UILayout.prop()``.
-    :arg enable_relating_type_suggestions: Enable additional suggestions for relating type properties.
-    :arg search_threshold: Minimum number of enum items required to show search button.
    :return: Added row.
    """
    # kwargs are layout.prop arguments (text, icon, etc.)
    row = layout.row(align=True)
    row.prop(data, prop_name, **kwargs)
    try:
-        if len(get_enum_items(data, prop_name, original_operator_path=original_operator_path)) > search_threshold:
+        if len(get_enum_items(data, prop_name, original_operator_path=original_operator_path)) > 10:
            # Magick courtesy of https://blender.stackexchange.com/a/203443/86891
            row.context_pointer_set(name="data", data=data)
-            op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM", **(button_kwargs or {}))
+            op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
            op.prop_name = prop_name
            op.should_click_ok = should_click_ok
            op.original_operator_path = original_operator_path or ""
-            op.enable_relating_type_suggestions = enable_relating_type_suggestions
    except TypeError:  # Prop is not iterable
        pass
    return row
@@ -438,23 +351,8 @@ def get_enum_items(
    return items


-def draw_expandable_panel(
-    layout: bpy.types.UILayout,
-    context: bpy.types.Context,
-    label: str,
-    ui_func: Callable[[bpy.types.UILayout, bpy.types.Context], None],
-    default_closed: bool = True,
-    *,
-    panel_id: str = "",
-) -> None:
-    """
-    :param panel_id: Optional unique identifier for the panel.
-        By default is matching ``label``, but if more than one panel with the same name is used,
-        then ``panel_id`` can be provided explicitly to ensure panels can be expanded/collapsed separately.
-    """
-    if not panel_id:
-        panel_id = label
-    header, panel = layout.panel(panel_id, default_closed=default_closed)
+def draw_expandable_panel(layout, context, label: str, ui_func, default_closed: bool = True):
+    header, panel = layout.panel(label, default_closed=default_closed)
    header.label(text=label)
    if panel:
        ui_func(panel, context)
@@ -498,12 +396,7 @@ def draw_filter(
        if data.data["saved_searches"]:
            row.operator("bim.load_search", text="", icon="IMPORT").module = module
        row.operator("bim.save_search", text="", icon="EXPORT").module = module
-        if module != "search":
-            if module == "drawing_include":
-                row.operator("bim.edit_element_filter", icon="CHECKMARK", text="").filter_mode = "INCLUDE"
-            if module == "drawing_exclude":
-                row.operator("bim.edit_element_filter", icon="CHECKMARK", text="").filter_mode = "EXCLUDE"
-            row.operator("bim.enable_editing_element_filter", icon="CANCEL", text="").filter_mode = "NONE"
+
    row = layout.row(align=True)
    row.operator("bim.add_filter_group", text="Add Search Group", icon="ADD").module = module
    row.operator("bim.edit_filter_query", text="", icon="FILTER").module = module
@@ -34,8 +34,7 @@ import bonsai.tool as tool
 from ifcopenshell.file import UndoSystemError
 from pathlib import Path
 from bonsai.tool.brick import BrickStore
-from typing import Union, Optional, TypedDict, NotRequired, Literal
-from collections.abc import Callable
+from typing import Set, Union, Optional, TypedDict, Callable, NotRequired, Literal


 IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]
@@ -64,17 +63,13 @@ class TransactionStep(TypedDict):

 class IfcStore:
    path: str = ""
-    """Should be set only using ``tool.Ifc.set_path``."""
-
    file: Optional[ifcopenshell.file] = None
-    """Should be set only using ``tool.Ifc.set``."""
-
    schema: Optional[ifcopenshell.ifcopenshell_wrapper.schema_definition] = None
    cache: Optional[ifcopenshell.ifcopenshell_wrapper.HdfSerializer] = None
    cache_path: Optional[str] = None
    id_map: dict[int, IFC_CONNECTED_TYPE] = {}
    guid_map: dict[str, IFC_CONNECTED_TYPE] = {}
-    edited_objs: set[bpy.types.Object] = set()
+    edited_objs: Set[bpy.types.Object] = set()
    pset_template_path: str = ""
    pset_template_file: Optional[ifcopenshell.file] = None
    classification_path: str = ""
@@ -109,45 +104,32 @@ class IfcStore:
        IfcStore.session_files = {}

    @staticmethod
-    def get_file() -> ifcopenshell.file | None:
+    def get_file():
        if IfcStore.file is None:
            props = tool.Blender.get_bim_props()
            IfcStore.set_path(props.ifc_file)
            if IfcStore.path:
                try:
                    IfcStore.load_file(IfcStore.path)
-                    tool.Ifc.after_file_loaded()
                except Exception as e:
                    print(f"Failed to load file {IfcStore.path}. Error details: {e}")
        return IfcStore.file

    @staticmethod
-    def set_path(value: str) -> None:
+    def set_path(value):
        IfcStore.path = value
        # Interpret relative paths as relative to .blend file.
        if IfcStore.path and not os.path.isabs(IfcStore.path):
            IfcStore.path = os.path.abspath(os.path.join(bpy.path.abspath("//"), IfcStore.path))

    @staticmethod
-    def generate_cache_path() -> str:
-        """Generate cache path based on the active file and it's path."""
-        assert IfcStore.file
-        ifc_key = IfcStore.path + IfcStore.file.header.file_name.time_stamp
-        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
-        prefs = tool.Blender.get_addon_preferences()
-        cache_path = os.path.join(prefs.cache_dir, f"{ifc_hash}.h5")
-        return cache_path
-
-    @staticmethod
-    def get_cache() -> ifcopenshell.geom.serializers.hdf5 | None:
-        """Get existing cache for the current file or create a new one.
-
-        .h5 cache name reflects IFC filepath and it's current header's timestamp.
-        """
+    def get_cache():
        if IfcStore.cache is None and IfcStore.path:
-            cache_path = IfcStore.generate_cache_path()
-            os.makedirs(os.path.dirname(cache_path), exist_ok=True)
-            IfcStore.cache_path = cache_path
+            props = tool.Blender.get_bim_props()
+            ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+            ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+            os.makedirs(props.cache_dir, exist_ok=True)
+            IfcStore.cache_path = os.path.join(props.cache_dir, f"{ifc_hash}.h5")
            cache_path = Path(IfcStore.cache_path)
            cache_settings = ifcopenshell.geom.settings()
            serializer_settings = ifcopenshell.geom.serializer_settings()
@@ -180,12 +162,15 @@ class IfcStore:
        return IfcStore.cache

    @staticmethod
-    def update_cache() -> None:
-        """Update cache filename after timestamp was updated."""
+    def update_cache():
        if not IfcStore.cache:
            return
        assert IfcStore.cache_path
-        new_cache_path = IfcStore.generate_cache_path()
+        assert IfcStore.file
+        ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+        props = tool.Blender.get_bim_props()
+        new_cache_path = os.path.join(props.cache_dir, f"{ifc_hash}.h5")
        IfcStore.cache = None
        try:
            shutil.move(IfcStore.cache_path, new_cache_path)
@@ -197,11 +182,11 @@ class IfcStore:
        IfcStore.get_cache()

    @staticmethod
-    def load_file(path: str) -> None:
+    def load_file(path) -> None:
        if not os.path.isfile(path):
            return
        extension = path.split(".")[-1]
-        prefs = tool.Blender.get_addon_preferences()
+        props = tool.Project.get_project_props()
        if extension.lower() == "ifczip":
            with tempfile.TemporaryDirectory() as unzipped_path:
                with zipfile.ZipFile(path, "r") as zip_ref:
@@ -211,11 +196,10 @@ class IfcStore:
                    return
        elif extension.lower() == "ifcxml":
            IfcStore.file = ifcopenshell.file(ifcopenshell.ifcopenshell_wrapper.parse_ifcxml(path))
-        elif prefs.should_stream:
+        elif props.should_stream:
            IfcStore.file = ifcopenshell.open(path, should_stream=True)
        else:
            IfcStore.file = ifcopenshell.open(path)
-        tool.Ifc.after_file_loaded()

    @staticmethod
    def get_schema() -> ifcopenshell.ifcopenshell_wrapper.schema_definition:
@@ -460,11 +444,8 @@ class IfcStore:

        return callback

-    modal_in_progress = False
-
-    @classmethod
+    @staticmethod
    def execute_ifc_operator(
-        cls,
        operator: tool.Ifc.Operator,
        context: bpy.types.Context,
        event=None,
@@ -474,33 +455,16 @@ class IfcStore:
        props = tool.Blender.get_bim_props()
        props.is_dirty = True
        # Modals don't nest, and Blender handles the loop that continuously calls modal()
-        # So for modal operators we emulate nesting - first modal call is starting transaction
-        # and modal call with FINISHED/CANCELLED result finishes it.
-
-        # Example call chain for modal operators:
-        # Operator1.execute called
-        # -> Operator.execute called nested Operator2
-        #    -> Operator2.execute returned RUNNING_MODAL
-        #    -> Operator2.execute is finished
-        # -> Operator1.execute is finished
-        # -> Operator2.modal is called and returned PASS_THROUGH (going to another modal loop)
-        # -> Operator2.modal is finished
-        # -> Operator2.modal called again and last two steps repeat until FINISHED or CANCELLED
-        is_top_level_operator = not bool(IfcStore.current_transaction) and not cls.modal_in_progress
+        is_top_level_operator = not bool(IfcStore.current_transaction) or (method == "MODAL")

        if is_top_level_operator:
            IfcStore.begin_transaction(operator)
-            if ifc_file := tool.Ifc.get():
-                assert (
-                    ifc_file.transaction is None
-                ), "Trying to override existing transaction, possible IFC undo data loss."
-                ifc_file.begin_transaction()
+            if tool.Ifc.get():
+                tool.Ifc.get().begin_transaction()
            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
                BrickStore.begin_transaction()
            # This empty transaction ensures that each operator has at least one transaction
            IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
-            if method == "MODAL":
-                cls.modal_in_progress = True
        else:
            operator.transaction_key = IfcStore.current_transaction

@@ -518,9 +482,6 @@ class IfcStore:
                IfcStore.end_transaction(operator)
                bonsai.bim.handler.refresh_ui_data()

-                if method == "MODAL":
-                    cls.modal_in_progress = False
-
        try:
            if method == "EXECUTE":
                result = getattr(operator, "_execute")(context)
@@ -541,10 +502,8 @@ class IfcStore:

        if method == "MODAL":
            if result == {"FINISHED"}:
-                is_top_level_operator = True
                end_top_level_operator()
            elif result == {"CANCELLED"}:
-                is_top_level_operator = True
                # Please read the docs: https://docs.blender.org/api/current/bpy.types.Operator.html
                # > "when an operator returns {'CANCELLED'}, no undo step will be created".
                # This means that if your modal edits IFC data, then the user
@@ -29,7 +29,6 @@ import numpy.typing as npt
 import multiprocessing
 import ifcopenshell
 import ifcopenshell.geom
-import ifcopenshell.ifcopenshell_wrapper as W
 import ifcopenshell.util.unit
 import ifcopenshell.util.element
 import ifcopenshell.util.geolocation
@@ -39,8 +38,7 @@ import ifcopenshell.util.shape
 import bonsai.tool as tool
 from bonsai.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
 from bonsai.tool.loader import OBJECT_DATA_TYPE
-from typing import Union, Optional, Any, Literal
-from collections.abc import Iterable
+from typing import Dict, Union, Optional, Any, Literal, Iterable
 from ifcopenshell.util.shape import MatrixType


@@ -49,7 +47,7 @@ class MaterialCreator:
    obj: bpy.types.Object

    def __init__(self, ifc_import_settings: IfcImportSettings, ifc_importer: IfcImporter):
-        self.styles: dict[int, bpy.types.Material] = {}
+        self.styles: Dict[int, bpy.types.Material] = {}
        self.parsed_meshes: set[str] = set()
        self.ifc_import_settings = ifc_import_settings
        self.ifc_importer = ifc_importer
@@ -219,7 +217,9 @@ class IfcImporter:
        self.gross_elements: set[ifcopenshell.entity_instance] = set()
        self.element_types: set[ifcopenshell.entity_instance] = set()
        self.spatial_elements: set[ifcopenshell.entity_instance] = set()
+        self.type_products = {}
        self.meshes: dict[str, OBJECT_DATA_TYPE] = {}
+        self.mesh_shapes = {}
        self.time = 0
        self.unit_scale = 1.0
        # ifc definition ids to blender elements mapping
@@ -229,8 +229,7 @@ class IfcImporter:
        self.progress = 0

        self.material_creator = MaterialCreator(ifc_import_settings, self)
-        prefs = tool.Blender.get_addon_preferences()
-        classes_to_wireframe_str = prefs.doc.classes_to_wireframe
+        classes_to_wireframe_str = tool.Drawing.get_document_props().classes_to_wireframe
        self.classes_to_wireframe_list = [word.strip() for word in classes_to_wireframe_str.split(",")]

    def profile_code(self, message: str) -> None:
@@ -301,6 +300,7 @@ class IfcImporter:
        tool.Spatial.run_spatial_import_spatial_decomposition()
        if default_container := tool.Spatial.guess_default_container():
            tool.Spatial.set_default_container(default_container)
+        tool.Loader.setup_active_bsdd_classification()
        self.update_progress(100)
        bpy.context.window_manager.progress_end()

@@ -461,10 +461,6 @@ class IfcImporter:
        return False

    def calculate_model_offset(self) -> None:
-        # TODO:
-        if isinstance(self.file, ifcopenshell.sqlite):
-            print("WARNING. Calculating model offset for IFCSQLite is not supported.")
-            return
        props = tool.Georeference.get_georeference_props()
        if self.ifc_import_settings.false_origin_mode == "MANUAL":
            tool.Loader.set_manual_blender_offset(self.file)
@@ -518,52 +514,11 @@ class IfcImporter:
            self.set_matrix_world(obj, tool.Loader.apply_blender_offset_to_matrix_world(obj, grid_placement))

    def create_element_types(self):
-        # TODO:
-        if isinstance(self.file, ifcopenshell.sqlite):
-            self.create_element_types_sqlite(self.element_types)
-            return
        for element_type in self.element_types:
+            if not element_type:
+                continue
            self.create_element_type(element_type)

-    def create_element_types_sqlite(self, element_types: set[ifcopenshell.entity_instance]) -> None:
-        assert isinstance(self.file, ifcopenshell.sqlite)
-        geometry_cache = self.file.get_geometry([e.id() for e in element_types])
-        geometry_meshes: dict[str, bpy.types.Mesh] = {}
-        for geometry_id, geometry in geometry_cache["geometry"].items():
-            verts = geometry["verts"]
-            fake_geometry = type("Geometry", (), {"id": geometry_id})
-            mesh_name = tool.Loader.get_mesh_name_from_shape(fake_geometry)  # pyright: ignore[reportArgumentType]
-            mesh = bpy.data.meshes.new(mesh_name)
-
-            if geometry["faces"].size:
-                mesh = tool.Loader.create_mesh_from_shape(
-                    mesh=mesh, faces=geometry["faces"].reshape(-1, 3), verts=verts.reshape(-1, 3)
-                )
-            else:
-                vertices = verts.reshape(-1, 3).tolist()
-                edges = geometry["edges"].reshape(-1, 2).tolist()
-                mesh.from_pydata(vertices, edges, [])
-            tool.Loader.link_mesh(fake_geometry, mesh)  # pyright: ignore[reportArgumentType]
-
-            mesh["ios_materials"] = geometry["materials"]
-            mesh["ios_material_ids"] = geometry["material_ids"]
-            self.meshes[mesh_name] = mesh
-            geometry_meshes[geometry_id] = mesh
-
-        shapes = geometry_cache["shapes"]
-        for element in element_types:
-            # Allow missing element types to accomodate older ifcsqlite files
-            # that didn't store element types geometry.
-            shape = shapes.get(element.id())
-            if shape:
-                geometry_id = shapes[element.id()]["geometry"]
-            else:
-                geometry_id = None
-            mesh = None if geometry_id is None else geometry_meshes[geometry_id]
-            obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
-            self.link_element(element, obj)
-            self.material_creator.create(element, obj, mesh, False)
-
    def create_element_type(self, element: ifcopenshell.entity_instance) -> None:
        self.ifc_import_settings.logger.info("Creating object %s", element)
        mesh = None
@@ -590,6 +545,7 @@ class IfcImporter:
        obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
        self.link_element(element, obj)
        self.material_creator.create(element, obj, mesh, False)
+        self.type_products[element.GlobalId] = obj

    def create_native_elements(self):
        if not self.ifc_import_settings.should_load_geometry:
@@ -673,13 +629,15 @@ class IfcImporter:
            verts = geometry["verts"]
            mesh["has_cartesian_point_offset"] = False

-            if geometry["faces"].size:
+            if geometry["faces"]:
                mesh = tool.Loader.create_mesh_from_shape(
                    mesh=mesh, faces=geometry["faces"].reshape(-1, 3), verts=verts.reshape(-1, 3)
                )
            else:
-                vertices = verts.reshape(-1, 3).tolist()
-                edges = geometry["edges"].reshape(-1, 2).tolist()
+                e = geometry["edges"]
+                v = verts
+                vertices = [[v[i], v[i + 1], v[i + 2]] for i in range(0, len(v), 3)]
+                edges = [[e[i], e[i + 1]] for i in range(0, len(e), 2)]
                mesh.from_pydata(vertices, edges, [])

            mesh["ios_materials"] = geometry["materials"]
@@ -703,7 +661,7 @@ class IfcImporter:
        settings: Optional[ifcopenshell.geom.main.settings] = None,
    ) -> set[ifcopenshell.entity_instance]:
        checkpoint = time.time()
-        results: set[ifcopenshell.entity_instance] = set()
+        results = set()
        if not products:
            return results

@@ -899,7 +857,7 @@ class IfcImporter:
        return obj

    def load_existing_meshes(self) -> None:
-        self.meshes.update({m.name: m for m in bpy.data.meshes if m.library is None})
+        self.meshes.update({m.name: m for m in bpy.data.meshes})

    def merge_materials_by_colour(self):
        cleaned_materials = {}
@@ -924,8 +882,7 @@ class IfcImporter:
        for material in self.material_creator.materials.values():
            bpy.data.materials.remove(material)

-    def add_project_to_scene(self) -> None:
-        assert bpy.context.scene
+    def add_project_to_scene(self):
        try:
            bpy.context.scene.collection.children.link(self.project["blender"])
        except:
@@ -950,7 +907,6 @@ class IfcImporter:
        bpy.ops.mesh.normals_make_consistent()
        bpy.ops.object.editmode_toggle()

-        assert bpy.context.view_layer
        bpy.context.view_layer.objects.active = last_obj
        IfcStore.edited_objs.clear()

@@ -969,7 +925,6 @@ class IfcImporter:
        if not (assignment := self.file.by_type("IfcProject")[0].UnitsInContext):
            return  # Geometry is optional in IFC
        props = tool.Blender.get_bim_props()
-        assert bpy.context.scene
        for unit in assignment.Units:
            if unit.is_a("IfcNamedUnit") and unit.UnitType == "LENGTHUNIT":
                if unit.is_a("IfcSIUnit"):
@@ -1077,9 +1032,9 @@ class IfcImporter:
    def create_curve(
        self,
        element: ifcopenshell.entity_instance,
-        shape: Union[W.Triangulation, W.TriangulationElement],
+        shape: Union[ifcopenshell.geom.ShapeElementType, ifcopenshell.geom.ShapeType],
    ) -> bpy.types.Curve:
-        if isinstance(shape, W.TriangulationElement):
+        if hasattr(shape, "geometry"):
            geometry = shape.geometry
        else:
            geometry = shape
@@ -1108,11 +1063,11 @@ class IfcImporter:
    def create_mesh(
        self,
        element: ifcopenshell.entity_instance,
-        shape: Union[W.Triangulation, W.TriangulationElement],
+        shape: Union[ifcopenshell.geom.ShapeElementType, ifcopenshell.geom.ShapeType],
        cartesian_point_offset: Union[npt.NDArray[np.float64], Literal[False]] = None,
    ) -> Union[bpy.types.Mesh, None]:
        try:
-            if isinstance(shape, W.TriangulationElement):
+            if hasattr(shape, "geometry"):
                # shape is ShapeElementType
                geometry = shape.geometry
            else:
@@ -1121,7 +1076,7 @@ class IfcImporter:
            # Mesh may already exists (e.g. during representation reimport)
            # and we assign some suffix to it to prevent Blender from adding '.001' suffix to the new mesh.
            mesh_name = tool.Loader.get_mesh_name_from_shape(geometry)
-            if old_mesh := bpy.data.meshes.get((mesh_name, None)):
+            if old_mesh := bpy.data.meshes.get(mesh_name):
                old_mesh.name = mesh_name + ".old"
            mesh = bpy.data.meshes.new(mesh_name)

@@ -1220,12 +1175,8 @@ class IfcImporter:


 class IfcImportSettings:
-    """
-    Initialize only using `IfcImportSettings.factory()`.
-    """
-
    input_file: Union[str, None] = None
-    logger: logging.Logger
+    logger: Union[logging.Logger, None] = None

    def __init__(self):
        self.diff_file = None
@@ -1262,7 +1213,6 @@ class IfcImportSettings:
        context=None, input_file: Optional[str] = None, logger: Optional[logging.Logger] = None
    ) -> IfcImportSettings:
        scene_diff = tool.Blender.get_diff_props()
-        prefs = tool.Blender.get_addon_preferences()
        props = tool.Project.get_project_props()
        settings = IfcImportSettings()
        settings.input_file = input_file
@@ -1275,7 +1225,7 @@ class IfcImportSettings:
        settings.should_merge_materials_by_colour = props.should_merge_materials_by_colour
        settings.should_load_geometry = props.should_load_geometry
        settings.should_clean_mesh = props.should_clean_mesh
-        settings.should_cache = prefs.should_always_cache or props.should_cache
+        settings.should_cache = props.should_cache
        settings.deflection_tolerance = props.deflection_tolerance
        settings.angular_tolerance = props.angular_tolerance
        settings.void_limit = props.void_limit
@@ -71,14 +71,11 @@ class AggregateData:
    @classmethod
    def total_linked_aggregate(cls) -> Union[int, None]:
        element = tool.Ifc.get_entity(bpy.context.active_object)
+        aggregate = ifcopenshell.util.element.get_aggregate(element)
+        if not aggregate:
+            return
        if not element:
            return
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        parts = ifcopenshell.util.element.get_parts(element)
-        if not aggregate and not parts:
-            return
-        if parts:
-            aggregate = element

        product_linked_agg_group = next(
            (
@@ -19,8 +19,6 @@
 import bpy
 import ifcopenshell
 import ifcopenshell.api
-import ifcopenshell.api.group
-import ifcopenshell.api.pset
 import ifcopenshell.util.element
 import bonsai.tool as tool
 import bonsai.core.aggregate as core
@@ -114,7 +112,7 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, tool.Ifc.Operator):
                pset = ifcopenshell.util.element.get_pset(element, "BBIM_Linked_Aggregate")
                if pset:
                    pset = tool.Ifc.get().by_id(pset["id"])
-                    ifcopenshell.api.pset.remove_pset(tool.Ifc.get(), product=element, pset=pset)
+                    ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=element, pset=pset)


 class BIM_OT_enable_editing_aggregate(bpy.types.Operator):
@@ -225,25 +223,16 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
    bl_idname = "bim.select_aggregate"
    bl_label = "Select Aggregate"
    bl_options = {"REGISTER", "UNDO"}
-
    obj: bpy.props.StringProperty()
    select_parts: bpy.props.BoolProperty(default=False)
-    one_level_deep: bpy.props.BoolProperty(
-        name="One Level Deep", description="Select only immediate children, not recursively", default=False
-    )

    @classmethod
    def description(cls, context, properties):
        if properties.select_parts:
-            return "Select Aggregate and Parts.\n\nCtrl+click to select only one level deep"
+            return "Select Aggregate and Parts"
        else:
            return "Select Aggregate"

-    def invoke(self, context, event):
-        if event.type == "LEFTMOUSE" and event.ctrl:
-            self.one_level_deep = True
-        return self.execute(context)
-
    def execute(self, context):
        all_parts = []
        for obj in context.selected_objects:
@@ -259,27 +248,14 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
                obj.select_set(False)

        if self.select_parts:
-            selected_parts = []
-
+            all_objs = []
            for part in all_parts:
                if part.IsDecomposedBy:
-                    for rel in part.IsDecomposedBy:
-                        for subpart in rel.RelatedObjects:
-                            selected_parts.append(subpart)
+                    for subpart in part.IsDecomposedBy[0].RelatedObjects:
+                        all_parts.append(subpart)
+                all_objs.append(part)

-                            # If not limited to one level, traverse deeper
-                            if not self.one_level_deep:
-
-                                def add_descendants(elem):
-                                    if elem.IsDecomposedBy:
-                                        for rel in elem.IsDecomposedBy:
-                                            for deeper in rel.RelatedObjects:
-                                                selected_parts.append(deeper)
-                                                add_descendants(deeper)
-
-                                add_descendants(subpart)
-
-            for element in set(selected_parts + all_parts):
+            for element in all_objs:
                obj = tool.Ifc.get_object(element)
                if obj:
                    obj.select_set(True)
@@ -287,11 +263,9 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
        else:
            for aggregate_element in all_parts:
                aggregate_obj = tool.Ifc.get_object(aggregate_element)
-                if aggregate_obj:
-                    aggregate_obj.select_set(True)
-                    bpy.context.view_layer.objects.active = aggregate_obj
+                aggregate_obj.select_set(True)
+                bpy.context.view_layer.objects.active = aggregate_obj

-        self.one_level_deep = False  # <-- forcibly reset
        return {"FINISHED"}


@@ -326,7 +300,6 @@ class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, tool.Ifc.Operato
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        ifc_file = tool.Ifc.get()
        element = tool.Ifc.get_entity(bpy.context.active_object)
        aggregate = ifcopenshell.util.element.get_aggregate(element)
        if not aggregate:
@@ -338,8 +311,8 @@ class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, tool.Ifc.Operato

        for part in parts:
            pset = ifcopenshell.util.element.get_pset(part, "BBIM_Linked_Aggregate")
-            pset = ifc_file.by_id(pset["id"])
-            ifcopenshell.api.pset.remove_pset(ifc_file, product=part, pset=pset)
+            pset = tool.Ifc.get().by_id(pset["id"])
+            ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=part, pset=pset)

        linked_aggregate_group = next(
            r.RelatingGroup
@@ -347,7 +320,7 @@ class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, tool.Ifc.Operato
            if r.is_a("IfcRelAssignsToGroup")
            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
        )
-        ifcopenshell.api.group.unassign_group(ifc_file, group=linked_aggregate_group, products=[aggregate])
+        tool.Ifc.run("group.unassign_group", group=linked_aggregate_group, products=[aggregate])

        return {"FINISHED"}

@@ -412,7 +385,7 @@ class BIM_OT_disable_aggregate_mode(bpy.types.Operator):

    def execute(self, context):
        bpy.ops.object.select_all(action="DESELECT")
-        core.exit_aggregate_mode(tool.Aggregate)
+        bonsai.core.aggregate.exit_aggregate_mode(tool.Aggregate)
        return {"FINISHED"}


@@ -136,7 +136,7 @@ class BIM_PT_linked_aggregate(Panel):
        assert (element := tool.Ifc.get_entity(obj))
        row = layout.row(align=True)

-        if element.Decomposes or element.IsDecomposedBy:
+        if element.Decomposes:
            Number_Linked_Aggregates = AggregateData.data["total_linked_aggregate"]
            if not Number_Linked_Aggregates:
                row.label(text="Not a Linked Aggregate")
@@ -21,6 +21,7 @@
 import os

 import ifcopenshell.api.alignment
+import ifcopenshell.api.alignment.add_stationing_to_alignment

 import bpy
 import json
@@ -37,6 +38,8 @@ import ifcopenshell.util.selector
 from datetime import datetime
 from dateutil import parser, relativedelta
 from bpy_extras.io_utils import ImportHelper
+from typing import get_args, TYPE_CHECKING
+from typing_extensions import assert_never


 class ImportAlignmentCSV(bpy.types.Operator, tool.Ifc.Operator, ImportHelper):
@@ -61,7 +64,9 @@ class ImportAlignmentCSV(bpy.types.Operator, tool.Ifc.Operator, ImportHelper):
    def _execute(self, context):
        self.file = tool.Ifc.get()
        start = time.time()
-        alignment = ifcopenshell.api.alignment.create_from_csv(self.file, self.filepath)
+        alignment = ifcopenshell.api.alignment.create_alignment_from_csv(self.file, self.filepath)
+        ifcopenshell.api.alignment.create_geometric_representation(self.file, alignment)
+        ifcopenshell.api.alignment.add_stationing_to_alignment(self.file, alignment=alignment, start_station=0.0)

        # IFC 4.1.5.1 alignments cannot be contained in spatial structures, but can be referenced into them
        sites = self.file.by_type("IfcSite")
@@ -25,23 +25,13 @@ classes = (
    operator.EditAttributes,
    operator.GenerateGlobalId,
    operator.CopyAttributeToSelection,
-    operator.ExplorerAddEntity,
-    operator.ExplorerEnableEditingEntity,
-    operator.ExplorerDisableEditingEntity,
-    operator.ExplorerEditEntity,
-    operator.ExplorerShowUIPopup,
    prop.BIMAttributeProperties,
-    prop.ExplorerEntity,
-    prop.BIMExplorerProperties,
    ui.BIM_PT_object_attributes,
-    ui.BIM_PT_explorer,
-    ui.BIM_UL_explorer,
 )


 def register():
    bpy.types.Object.BIMAttributeProperties = bpy.props.PointerProperty(type=prop.BIMAttributeProperties)
-    bpy.types.Scene.BIMExplorerProperties = bpy.props.PointerProperty(type=prop.BIMExplorerProperties)


 def unregister():
@@ -26,11 +26,7 @@ import bonsai.bim.helper
 import bonsai.tool as tool
 import bonsai.core.attribute as core
 import bonsai.core.spatial
-from typing import TYPE_CHECKING, Any, Union, Literal
-
-if TYPE_CHECKING:
-    from bonsai.bim.prop import Attribute
-    import bpy.stub_internal.rna_enums as rna_enums
+from typing import TYPE_CHECKING


 def get_objs_for_operation(
@@ -79,9 +75,7 @@ class EnableEditingAttributes(bpy.types.Operator, AttributesOperator):
                None,
            )

-        lookup_attrs = tool.Attribute.does_ifc_class_support_explorer_lookup(element.is_a())
-
-        def callback(name: str, prop: Union["Attribute", None], data: dict[str, Any]) -> None | Literal[True]:
+        def callback(name, prop, data):
            if name in ("RefLatitude", "RefLongitude"):
                new = props.attributes.add()
                new.name = name
@@ -95,19 +89,8 @@ class EnableEditingAttributes(bpy.types.Operator, AttributesOperator):
            if name in ("PredefinedType", "ObjectType") and has_inherited_predefined_type:
                props.attributes.remove(len(props.attributes) - 1)
                return True
-            if lookup_attrs and (name in lookup_attrs):
-                new = props.attributes.add()
-                new.name = name
-                new.ifc_class = data["type"]
-                new.data_type = "enum"
-                new.is_optional = True
-                new.enum_items_dynamic = lookup_attrs[name]
-                new.use_explorer_ui = True
-                value: Union[ifcopenshell.entity_instance, None] = data[name]
-                if value is not None:
-                    new.enum_value = str(value.id())

-        bonsai.bim.helper.import_attributes(element, props.attributes, callback=callback)
+        bonsai.bim.helper.import_attributes2(element, props.attributes, callback=callback)
        props.is_editing_attributes = True

    def execute(self, context):
@@ -124,8 +107,7 @@ class DisableEditingAttributes(bpy.types.Operator, AttributesOperator):

    def disable_editing_attributes_on_obj(self, obj: bpy.types.Object) -> None:
        props = tool.Blender.get_object_attribute_props(obj)
-        props.attributes.clear()
-        props.property_unset("is_editing_attributes")
+        props.is_editing_attributes = False

    def execute(self, context):
        for obj in get_objs_for_operation(self, context):
@@ -145,7 +127,7 @@ class EditAttributes(bpy.types.Operator, tool.Ifc.Operator):
        if not obj or not (element := tool.Ifc.get_entity(obj)):
            return

-        def callback(attributes: dict[str, Any], prop: "Attribute") -> None | Literal[True]:
+        def callback(attributes, prop):
            if prop.name in ("RefLatitude", "RefLongitude"):
                if not prop.is_null:
                    try:
@@ -156,9 +138,6 @@ class EditAttributes(bpy.types.Operator, tool.Ifc.Operator):

        props = tool.Blender.get_object_attribute_props(obj)
        attributes = bonsai.bim.helper.export_attributes(props.attributes, callback=callback)
-        lookup_attrs = tool.Attribute.does_ifc_class_support_explorer_lookup(element.is_a())
-        if lookup_attrs:
-            bonsai.bim.helper.process_exported_entity_attribute(attributes, list(lookup_attrs))
        ifcopenshell.api.attribute.edit_attributes(self.file, product=element, attributes=attributes)

        tool.Root.set_object_name(obj, element)
@@ -225,139 +204,3 @@ class CopyAttributeToSelection(bpy.types.Operator, tool.Ifc.Operator):
            tool.Ifc, tool.Blender, tool.Root, tool.Spatial, name=self.name, value=value
        )
        self.report({"INFO"}, f"Attribute was successfully copied to {total} elements.")
-
-
-class ExplorerAddEntity(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.explorer_add_entity"
-    bl_label = "Add Entity"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context) -> None:
-        props = tool.Attribute.get_explorer_props()
-        ifc_file = tool.Ifc.get()
-
-        entity = ifc_file.create_entity(props.ifc_class)
-        tool.Attribute.refresh_uilist_entities()
-        tool.Attribute.enable_editing_entity(entity)
-        tool.Attribute.import_entity_attributes(entity)
-
-
-class ExplorerEnableEditingEntity(bpy.types.Operator):
-    bl_idname = "bim.explorer_enable_editing_entity"
-    bl_label = "Enable Editing Entity"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context) -> "set[rna_enums.OperatorReturnItems]":
-        props = tool.Attribute.get_explorer_props()
-        ifc_file = tool.Ifc.get()
-        assert (active_entity := props.active_entity)
-        entity = ifc_file.by_id(active_entity.ifc_definition_id)
-
-        tool.Attribute.disable_editing_entity()
-        tool.Attribute.enable_editing_entity(entity)
-        tool.Attribute.import_entity_attributes(entity)
-        return {"FINISHED"}
-
-
-class ExplorerDisableEditingEntity(bpy.types.Operator):
-    bl_idname = "bim.explorer_disable_editing_entity"
-    bl_label = "Disable Editing Entity"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context) -> set["rna_enums.OperatorReturnItems"]:
-        tool.Attribute.disable_editing_entity()
-        return {"FINISHED"}
-
-
-class ExplorerEditEntity(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.explorer_edit_entity"
-    bl_label = "Edit Entity"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context) -> None:
-        ifc_file = tool.Ifc.get()
-        props = tool.Attribute.get_explorer_props()
-        entity = ifc_file.by_id(props.editing_entity_id)
-
-        attrs = tool.Attribute.export_entity_attributes()
-        for attr, value in attrs.items():
-            setattr(entity, attr, value)
-        tool.Attribute.refresh_uilist_entities()
-        tool.Attribute.disable_editing_entity()
-
-
-class ExplorerShowUIPopup(bpy.types.Operator):
-    bl_idname = "bim.explorer_show_ui_popup"
-    bl_label = "Show Explorer UI"
-    bl_description = "Show Explorer UI to select element as attribute value or edit it."
-    bl_options = {"REGISTER", "UNDO"}
-
-    ifc_class: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
-    """Element IFC class."""
-    attribute_name: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
-    """IFC class attribute name."""
-    data_path: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
-    """Full data path"""
-    preselect_ifc_id: bpy.props.IntProperty(options={"SKIP_SAVE"})  # pyright: ignore[reportRedeclaration]
-    """IFC id to preselect in the popup."""
-
-    if TYPE_CHECKING:
-        ifc_class: str
-        attribute_name: str
-        data_path: str
-        preselect_ifc_id: int
-
-    def invoke(self, context, event) -> "set[rna_enums.OperatorReturnItems]":
-        assert context.window_manager
-        assert self.ifc_class and self.attribute_name and self.data_path
-
-        props = tool.Attribute.get_explorer_props()
-        props.is_loaded = True
-        props.ifc_class = self.get_attribute_type()
-
-        if self.preselect_ifc_id:
-            props.active_entity_index = next(
-                i for i, e in enumerate(props.entities) if e.ifc_definition_id == self.preselect_ifc_id
-            )
-
-        return context.window_manager.invoke_props_dialog(self, width=400)
-
-    def get_attribute_type(self) -> str:
-        schema = tool.Ifc.schema()
-        entity = schema.declaration_by_name(self.ifc_class).as_entity()
-        assert entity
-        i = entity.attribute_index(self.attribute_name)
-        attr = entity.all_attributes()[i]
-        named_type = attr.type_of_attribute().as_named_type()
-        assert named_type
-        declared = named_type.declared_type()
-        return declared.name()
-
-    def draw(self, context) -> None:
-        from bonsai.bim.module.attribute.ui import BIM_PT_explorer
-
-        BIM_PT_explorer.draw(self, context, is_popup=True)
-
-    def execute(self, context) -> "set[rna_enums.OperatorReturnItems]":
-        props = tool.Attribute.get_explorer_props()
-        active_entity = props.active_entity
-        if active_entity is None:
-            self.report({"WARNING"}, "No entity selected.")
-            return {"FINISHED"}
-
-        # Apply pending changes for convenience.
-        if props.editing_entity_id:
-            if props.editing_entity_id == active_entity.ifc_definition_id:
-                bpy.ops.bim.explorer_edit_entity()
-            else:
-                bpy.ops.bim.explorer_disable_editing_entity()
-
-        # Very important to do it after changes applied, otherwise enum might update
-        # and index will be pointing to a different element.
-        exec(f"{self.data_path} = '{active_entity.ifc_definition_id}'")
-        return {"FINISHED"}
-
-    def cancel(self, context: bpy.types.Context) -> None:
-        props = tool.Attribute.get_explorer_props()
-        if props.editing_entity_id:
-            bpy.ops.bim.explorer_disable_editing_entity()
@@ -17,7 +17,6 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-import bonsai.tool as tool
 from bonsai.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup
 from bpy.props import (
@@ -30,7 +29,7 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING


 class BIMAttributeProperties(PropertyGroup):
@@ -40,62 +39,3 @@ class BIMAttributeProperties(PropertyGroup):
    if TYPE_CHECKING:
        attributes: bpy.types.bpy_prop_collection_idprop[Attribute]
        is_editing_attributes: bool
-
-
-class ExplorerEntity(PropertyGroup):
-    ifc_definition_id: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
-
-    if TYPE_CHECKING:
-        ifc_definition_id: int
-
-
-class BIMExplorerProperties(PropertyGroup):
-    def update_is_loaded(self, context: object) -> None:
-        if self.is_loaded:
-            # Trigger refresh.
-            self.ifc_class = self.ifc_class
-        else:
-            self.property_unset("is_loaded")
-            self.property_unset("ifc_class")
-            self.entities.clear()
-            self.property_unset("active_entity_index")
-            self.property_unset("editing_entity_id")
-            self.entity_attributes.clear()
-
-    is_loaded: BoolProperty(  # pyright: ignore[reportRedeclaration]
-        name="Toggle Explorer UI",
-        update=update_is_loaded,
-    )
-
-    def get_ifc_class(self, context: object) -> tool.Blender.BLENDER_ENUM_ITEMS:
-        # TODO: Add more entities.
-        classes = [
-            "IfcPostalAddress",
-            "IfcTelecomAddress",
-        ]
-        return [(c, c, "") for c in classes]
-
-    def update_ifc_class(self, context: object) -> None:
-        tool.Attribute.refresh_uilist_entities()
-
-    ifc_class: EnumProperty(  # pyright: ignore[reportRedeclaration]
-        name="IFC Class To Search",
-        items=get_ifc_class,
-        update=update_ifc_class,
-    )
-    entities: CollectionProperty(type=ExplorerEntity)  # pyright: ignore[reportRedeclaration]
-    active_entity_index: IntProperty()  # pyright: ignore[reportRedeclaration]
-    editing_entity_id: IntProperty()  # pyright: ignore[reportRedeclaration]
-    entity_attributes: CollectionProperty(type=Attribute)  # pyright: ignore[reportRedeclaration]
-
-    if TYPE_CHECKING:
-        is_loaded: bool
-        ifc_class: str
-        entities: bpy.types.bpy_prop_collection_idprop[ExplorerEntity]
-        active_entity_index: int
-        editing_entity_id: int
-        entity_attributes: bpy.types.bpy_prop_collection_idprop[Attribute]
-
-    @property
-    def active_entity(self) -> Union[ExplorerEntity, None]:
-        return tool.Blender.get_active_uilist_element(self.entities, self.active_entity_index)
@@ -16,16 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

-from __future__ import annotations
 import bonsai.bim.helper
 import bpy.types
 from bpy.types import Panel
 from bonsai.bim.module.attribute.data import AttributesData
 import bonsai.tool as tool
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from bonsai.bim.module.attribute.prop import BIMExplorerProperties, ExplorerEntity


 def draw_ui(context: bpy.types.Context, layout: bpy.types.UILayout, attributes) -> None:
@@ -38,9 +33,7 @@ def draw_ui(context: bpy.types.Context, layout: bpy.types.UILayout, attributes)
        row.operator("bim.edit_attributes", icon="CHECKMARK", text="Save Attributes")
        row.operator("bim.disable_editing_attributes", icon="CANCEL", text="")

-        bonsai.bim.helper.draw_attributes(
-            props.attributes, layout, copy_operator="bim.copy_attribute_to_selection", enable_search=True
-        )
+        bonsai.bim.helper.draw_attributes(props.attributes, layout, copy_operator="bim.copy_attribute_to_selection")
    else:
        row = layout.row()
        op = row.operator("bim.enable_editing_attributes", icon="GREASEPENCIL", text="Edit")
@@ -73,73 +66,3 @@ class BIM_PT_object_attributes(Panel):
        if not AttributesData.is_loaded:
            AttributesData.load()
        draw_ui(context, self.layout, AttributesData.data["attributes"])
-
-
-class BIM_PT_explorer(Panel):
-    bl_label = "Explorer"
-    bl_idname = "BIM_PT_explorer"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_project_setup"
-
-    def draw(self, context, *, is_popup=False):
-        assert (layout := self.layout)
-        props = tool.Attribute.get_explorer_props()
-
-        if is_popup:
-            layout.label(text=props.ifc_class)
-        else:
-            if not props.is_loaded:
-                row = layout.row(align=True)
-                row.label(text="Explorer UI is not Loaded.")
-                row.prop(props, "is_loaded", text="", icon="IMPORT")
-                return
-
-            row = layout.row(align=True)
-            row.prop(props, "ifc_class", text="")
-            row.prop(props, "is_loaded", text="", icon="CANCEL")
-
-        active_entity = props.active_entity
-        row = layout.row(align=True)
-        row.label(text=f"{len(props.entities)} entities found")
-        row.operator("bim.explorer_add_entity", text="", icon="ADD")
-
-        if active_entity:
-            if active_entity.ifc_definition_id == props.editing_entity_id:
-                row.operator("bim.explorer_disable_editing_entity", icon="CANCEL", text="")
-            else:
-                row.operator("bim.explorer_enable_editing_entity", icon="GREASEPENCIL", text="")
-            # TODO: 'Remove' button?
-
-        layout.template_list("BIM_UL_explorer", "", props, "entities", props, "active_entity_index")
-
-        if props.editing_entity_id:
-            box = self.layout.box()
-            # In popup we accept edits automatically for the convenience.
-            # Othrewise it seems very unintuitive, when you need to click confirmation twice.
-            if not is_popup:
-                row = box.row(align=True)
-                row.operator("bim.explorer_edit_entity", icon="CHECKMARK")
-                row.operator("bim.explorer_disable_editing_entity", icon="CANCEL", text="")
-            bonsai.bim.helper.draw_attributes(props.entity_attributes, box, enable_search=True)
-
-
-class BIM_UL_explorer(bpy.types.UIList):
-    def draw_item(
-        self,
-        context: bpy.types.Context,
-        layout: bpy.types.UILayout,
-        data: BIMExplorerProperties,
-        item: ExplorerEntity,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
-        row = layout.row(align=True)
-
-        if item.ifc_definition_id == data.editing_entity_id:
-            row.label(text=item.name, icon="GREASEPENCIL")
-        else:
-            row.label(text=item.name)
@@ -71,7 +71,6 @@ classes = (
    ui.BIM_PT_bcf,
    ui.BIM_PT_bcf_metadata,
    ui.BIM_PT_bcf_comments,
-    ui.BIM_UL_topics,
 )


@@ -397,7 +397,7 @@ class AddBcfBimSnippet(bpy.types.Operator):
    def poll(cls, context):
        props = tool.Bcf.get_bcf_props()
        props_are_filled = all(
-            getattr(props, attr) for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type")
+            (getattr(props, attr) for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type"))
        )
        if not props_are_filled:
            cls.poll_message_set("Some BIM snippet fields are empty.")
@@ -1208,11 +1208,9 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        self.file = tool.Ifc.get()
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        assert bcfxml
-        assert context.scene

        props = tool.Bcf.get_bcf_props()
        blender_topic = props.active_topic
-        assert blender_topic
        topic = bcfxml.topics[blender_topic.name]
        if self.viewpoint_guid:
            viewpoint_guid = self.viewpoint_guid
@@ -1236,7 +1234,6 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        cam_height = context.scene.render.resolution_y
        cam_aspect = cam_width / cam_height

-        assert isinstance(obj.data, bpy.types.Camera)
        obj.data.background_images.clear()
        if viewpoint.snapshot:
            obj.data.show_background_images = True
@@ -1276,7 +1273,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        if tool.Bcf.get_viewpoint_bitmaps(viewpoint):
            self.create_bitmaps(bcfxml, viewpoint, topic)

-        self.setup_camera(viewpoint, obj, cam_aspect, context, cam_height, cam_width)
+        self.setup_camera(viewpoint, obj, cam_aspect, context)
        return {"FINISHED"}

    def setup_camera(
@@ -1285,8 +1282,6 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        obj: bpy.types.Object,
        cam_aspect: float,
        context: bpy.types.Context,
-        cam_height: float,
-        cam_width: float,
    ) -> None:
        assert isinstance(obj.data, bpy.types.Camera)
        if viewpoint.visualization_info.orthogonal_camera:
@@ -31,6 +31,9 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
+from functools import partial
+from typing import Literal
+from typing_extensions import assert_never
 from bcf.agnostic.extensions import get_extensions_attributes
 from typing import TYPE_CHECKING, Union

@@ -16,16 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

-from __future__ import annotations
 import os
 import bpy
 import bonsai.tool as tool
 from . import bcfstore
 from bpy.types import Panel
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from bonsai.bim.module.bcf.prop import BcfTopic, BCFProperties


 class BIM_PT_bcf(Panel):
@@ -38,7 +33,6 @@ class BIM_PT_bcf(Panel):
    bl_parent_id = "BIM_PT_tab_collaboration"

    def draw(self, context):
-        assert self.layout
        layout = self.layout
        layout.use_property_split = True
        layout.use_property_decorate = False
@@ -131,7 +125,6 @@ class BIM_PT_bcf_metadata(Panel):
        # without adding them to specific topic.
        # Currently we just handle it the same way as in v2
        # documents are accessed and managed from topics.
-        assert self.layout
        layout = self.layout
        layout.use_property_split = True
        layout.use_property_decorate = False
@@ -146,7 +139,6 @@ class BIM_PT_bcf_metadata(Panel):
        bcf_v3 = bcf_verison.startswith("3")

        topic = props.active_topic
-        assert topic
        bcf_topic = bcfxml.topics[topic.name]

        layout.label(text="Header Files:")
@@ -311,7 +303,6 @@ class BIM_PT_bcf_comments(Panel):
        row.prop(props, "comment_text_width")

        topic = props.active_topic
-        assert topic
        for comment in topic.comments:
            box = self.layout.box()

@@ -350,20 +341,3 @@ class BIM_PT_bcf_comments(Panel):
        row.prop(props, "has_related_viewpoint")
        row = layout.row()
        row.operator("bim.add_bcf_comment")
-
-
-class BIM_UL_topics(bpy.types.UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BCFProperties,
-        item: BcfTopic,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
-        if item:
-            layout.prop(item, "title", text="", emboss=False)
-        else:
-            layout.label(text="", translate=False)
@@ -40,7 +40,6 @@ from mathutils import Vector, Matrix
 from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.model.decorator import ProfileDecorator
 from bonsai.bim.module.boundary.decorator import BoundaryDecorator
-from ifcopenshell.util.shape_builder import ShapeBuilder
 import bonsai.core
 import bonsai.core.geometry
 from typing import Union, Optional
@@ -405,13 +404,12 @@ class EditBoundaryAttributes(bpy.types.Operator, tool.Ifc.Operator):
        assert obj
        bprops = tool.Boundary.get_object_boundary_props(obj)
        boundary = tool.Ifc.get_entity(obj)
-        assert boundary
        attributes = dict()
        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
            obj = getattr(bprops, blender_property, None)
            entity = tool.Ifc.get_entity(obj)
            attributes[blender_property] = entity
-        ifcopenshell.api.boundary.edit_attributes(tool.Ifc.get(), entity=boundary, **attributes)
+        ifcopenshell.api.run("boundary.edit_attributes", tool.Ifc.get(), entity=boundary, **attributes)
        bpy.ops.bim.disable_editing_boundary()
        return {"FINISHED"}

@@ -607,12 +605,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        parent_boundaries: list[ifcopenshell.entity_instance] = []

        objs = tool.Blender.get_selected_objects()
-        ifc_objects = {
-            element: obj
-            for obj in objs
-            if (element := tool.Ifc.get_entity(obj)) and isinstance(obj.data, bpy.types.Mesh) and obj.data.vertices
-        }
-
+        ifc_objects = {element: obj for obj in objs if (element := tool.Ifc.get_entity(obj))}
        if len(ifc_objects) not in (1, 2):
            self.report({"ERROR"}, "Please select one or two IFC elements.")
            return {"CANCELLED"}
@@ -654,6 +647,46 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                return {"FINISHED"}
            parent_boundaries.extend(res)

+        elif len(objs) == 1 and False:
+            # Optionally the user may select just the space, and the building element shall be auto-detected
+            # TODO : refactor to be able to generate all boundaries for selected space automatically or with an option
+
+            relating_space = None
+            related_building_element = None
+            relating_space_obj = None
+            related_building_element_obj = None
+
+            def msg(self, context):
+                self.layout.label(text="Please set an active container to detect space boundaries from.")
+
+            element = tool.Ifc.get_entity(objs[0])
+            if element.is_a("IfcSpace"):
+                relating_space = element
+                relating_space_obj = objs[0]
+
+            if not (container := tool.Root.get_default_container()):
+                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
+                return
+
+            for subelement in ifcopenshell.util.element.get_decomposition(container):
+                if not (
+                    subelement.is_a("IfcWall") or subelement.is_a("IfcSlab") or subelement.is_a("IfcVirtualElement")
+                ):
+                    continue
+                obj = tool.Ifc.get_object(subelement)
+                if obj:
+                    related_building_element = subelement
+                    related_building_element_obj = obj
+                    parent_boundary = self.create_element_boundary(
+                        context,
+                        relating_space,
+                        relating_space_obj,
+                        related_building_element,
+                        related_building_element_obj,
+                    )
+                    if parent_boundary:
+                        parent_boundaries.append(parent_boundary)
+
        bpy.ops.bim.show_boundaries()
        for parent_boundary in parent_boundaries:
            obj = tool.Ifc.get_object(parent_boundary)
@@ -678,14 +711,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
            + tool.Ifc.get().by_type("IfcVirtualElement")
        )

-        for building_element in building_elements:
-            if obj := tool.Ifc.get_object(building_element):
-                if tool.Ifc.is_moved(obj):
-                    bonsai.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
-
-        if tool.Ifc.is_moved(space_obj):
-            bonsai.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=space_obj)
-
        # Don't generate boundaries of building elements that we've already got bounaries for.
        for boundary in space.BoundedBy:
            if boundary.RelatedBuildingElement in building_elements:
@@ -702,10 +727,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
            while True:
                tree.add_element(iterator.get_native())
                shape = iterator.get()
-                shapes[shape.id] = {
-                    "verts": ifcopenshell.util.shape.get_vertices(shape.geometry),
-                    "faces": ifcopenshell.util.shape.get_faces(shape.geometry),
-                }
+                shapes[shape.id] = shape
                if not iterator.next():
                    break

@@ -726,11 +748,13 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
            bm = bmesh.new()
            shape = shapes[building_element.id()]

-            for vert in shape["verts"]:
+            verts = ifcopenshell.util.shape.get_vertices(shape.geometry)
+            for vert in verts:
                bm.verts.new(Vector(vert))
            bm.verts.ensure_lookup_table()

-            for face in shape["faces"]:
+            faces = ifcopenshell.util.shape.get_faces(shape.geometry)
+            for face in faces:
                bm.faces.new([bm.verts[i] for i in face])
            bm.verts.ensure_lookup_table()
            bm.faces.ensure_lookup_table()
@@ -985,7 +1009,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                continue

            connection_geometry = self.create_connection_geometry_from_polygon(opening_polygon, target_face_matrix)
-            boundary = ifcopenshell.api.root.create_entity(ifc_file, ifc_class=props.boundary_class)
+            boundary = tool.Ifc.run("root.create_entity", ifc_class=props.boundary_class)
            boundary.RelatingSpace = space
            boundary.RelatedBuildingElement = filling
            boundary.ConnectionGeometry = connection_geometry
@@ -1059,11 +1083,15 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):

        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
        tool.Model.unit_scale = self.unit_scale
-        builder = ShapeBuilder(tool.Ifc.get())

        surface = tool.Ifc.get().createIfcCurveBoundedPlane()
-        placement = builder.create_axis2_placement_3d([o / self.unit_scale for o in p1], z_axis, x_axis)
-        surface.BasisSurface = tool.Ifc.get().create_entity("IfcPlane", placement)
+        surface.BasisSurface = tool.Ifc.get().createIfcPlane(
+            tool.Ifc.get().createIfcAxis2Placement3D(
+                tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
+                tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
+                tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
+            )
+        )

        if tool.Ifc.get().schema != "IFC2X3":
            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
@@ -20,21 +20,15 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.AddBSDDProperties,
-    operator.ImportBSDDClasses,
+    operator.GetBSDDClassificationProperties,
    operator.LoadBSDDDictionaries,
-    operator.SearchBSDDClassifications,
-    operator.SearchBSDDProperties,
-    operator.BIM_OT_show_bsdd_description,
+    operator.SearchBSDDClass,
    prop.BSDDDictionary,
    prop.BSDDClassification,
-    prop.BSDDProperty,
    prop.BSDDPset,
    prop.BIMBSDDProperties,
-    ui.BIM_UL_bsdd_classifications,
    ui.BIM_UL_bsdd_dictionaries,
-    ui.BIM_UL_bsdd_classes,
-    ui.BIM_UL_bsdd_properties,
+    ui.BIM_UL_bsdd_classifications,
    ui.BIM_PT_bsdd,
 )

@@ -38,7 +38,8 @@ class BSDDData:
        cls.data["active_dictionary"] = cls.active_dictionary()

    @classmethod
-    def active_dictionary(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
+    def active_dictionary(cls):
+        props = tool.Bsdd.get_bsdd_props()
        results = [("ALL", "All Dictionaries", "All active dictionaries")]
-        results.extend(tool.Bsdd.get_active_bsdd_enum_items())
+        results.extend([(d.uri, d.name, f"{d.status} - {d.version}") for d in props.dictionaries if d.is_active])
        return results
@@ -15,14 +15,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-import textwrap
+
 import bpy
 import bsdd
 import bonsai.tool as tool
-import ifcopenshell.api.pset
-import ifcopenshell.util.element
 from bonsai.core import bsdd as core
-from typing import Any


 class LoadBSDDDictionaries(bpy.types.Operator):
@@ -35,112 +32,28 @@ class LoadBSDDDictionaries(bpy.types.Operator):
        return {"FINISHED"}


-class SearchBSDDClassifications(bpy.types.Operator):
+class SearchBSDDClass(bpy.types.Operator):
    bl_idname = "bim.search_bsdd_classifications"
    bl_label = "Search bSDD Class"
    bl_description = "Search for bSDD classes by the provided keyword"
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        total = core.search_bsdd_class(tool.Bsdd, tool.Bsdd.get_bsdd_props().keyword)
-        self.report({"INFO"}, f"{total} bSDD classes found.")
+        keyword = context.scene.BIMBSDDProperties.keyword
+        classes_found = core.search_class(keyword, tool.Bsdd)
+        self.report({"INFO"}, f"{classes_found} bSDD classes found for '{keyword}'.")
        return {"FINISHED"}


-class ImportBSDDClasses(bpy.types.Operator):
-    bl_idname = "bim.import_bsdd_classes"
-    bl_label = "Import bSDD Classes"
-    bl_description = "Load bSDD classes that apply to the current element"
+class GetBSDDClassificationProperties(bpy.types.Operator):
+    bl_idname = "bim.get_bsdd_classification_properties"
+    bl_label = "Search bSDD Class Properties"
+    bl_description = "Search for bSDD class properties for the currently selected class"
    bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
-    obj_type: bpy.props.StringProperty()

    def execute(self, context):
-        props = tool.Bsdd.get_bsdd_props()
-        core.import_bsdd_classes(tool.Bsdd, self.obj, self.obj_type)
-        self.report({"INFO"}, f"{len(props.classes)} bSDD classes found.")
+        pset_data = core.get_class_properties(tool.Bsdd)
+        psets_found = len(pset_data)
+        props_found = sum(len(pset) for pset in pset_data.values())
+        self.report({"INFO"}, f"{psets_found} psets found ({props_found} props) for the active classification.")
        return {"FINISHED"}
-
-
-class SearchBSDDProperties(bpy.types.Operator):
-    bl_idname = "bim.search_bsdd_properties"
-    bl_label = "Search bSDD Properties"
-    bl_description = "Search for bSDD properties that apply to the current element"
-    bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
-    obj_type: bpy.props.StringProperty()
-
-    def execute(self, context):
-        props = tool.Bsdd.get_bsdd_props()
-        core.search_bsdd_properties(tool.Bsdd, tool.Bsdd.get_bsdd_props().keyword, self.obj, self.obj_type)
-        self.report({"INFO"}, f"{len(props.properties)} bSDD properties found.")
-        return {"FINISHED"}
-
-
-class AddBSDDProperties(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_bsdd_properties"
-    bl_label = "Add bSDD Properties"
-    bl_description = "Add selected bSDD properties to the active object"
-    bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
-    obj_type: bpy.props.StringProperty()
-
-    @classmethod
-    def poll(cls, context):
-        props = tool.Bsdd.get_bsdd_props()
-        if not props.selected_properties:
-            cls.poll_message_set("No properties selected to add.")
-            return False
-        return True
-
-    def _execute(self, context):
-        self.file = tool.Ifc.get()
-        bprops = tool.Bsdd.get_bsdd_props()
-
-        psets: dict[str, dict[str, Any]] = {}
-        for selected_property in bprops.selected_properties:
-            psets.setdefault(selected_property.metadata, {})[selected_property.name] = selected_property.get_value()
-
-        ifc_definition_id = tool.Blender.get_obj_ifc_definition_id(self.obj, self.obj_type, context)
-        assert ifc_definition_id
-        element = tool.Ifc.get().by_id(ifc_definition_id)
-
-        current_psets = ifcopenshell.util.element.get_psets(element, verbose=True)
-        for pset_name, properties in psets.items():
-            if pset := current_psets.get(pset_name, None):
-                pset = self.file.by_id(pset["id"])
-            else:
-                pset = ifcopenshell.api.pset.add_pset(self.file, product=element, name=pset_name)
-            ifcopenshell.api.pset.edit_pset(self.file, pset=pset, properties=properties)
-
-
-class BIM_OT_show_bsdd_description(bpy.types.Operator):
-    bl_idname = "bim.show_bsdd_description"
-    bl_label = "bSDD Description"
-    url: bpy.props.StringProperty()
-
-    def invoke(self, context, event):
-        wm = context.window_manager
-        return wm.invoke_props_dialog(self, width=450)
-
-    def execute(self, context):
-        return {"FINISHED"}
-
-    def draw(self, context):
-        WIDTH = 80
-        layout = self.layout
-        wrapper = textwrap.TextWrapper(width=WIDTH)
-        result = tool.Bsdd.get_bsdd_property(self.url)
-        description = result.get("description") or ""
-        definition = result.get("definition") or ""
-        if description != definition:
-            text = wrapper.wrap(f"Description : {description}")
-            text.append("-" * (WIDTH - 15))
-            text += wrapper.wrap(f"Definition : {definition}")
-        else:
-            text = wrapper.wrap(f"Description : {description}")
-        for line in text:
-            layout.label(text=line)
-        if self.url:
-            url_op = layout.operator("bim.open_uri", icon="URL", text="Online bSDD Documentation")
-            url_op.uri = self.url
@@ -17,10 +17,8 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-import bonsai.tool as tool
 from bpy.types import PropertyGroup
 from bonsai.bim.module.bsdd.data import BSDDData
-from bonsai.bim.module.classification.data import ClassificationsData
 from bonsai.bim.prop import Attribute, StrProperty
 from bpy.props import (
    PointerProperty,
@@ -32,123 +30,51 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
-from typing import Union, TYPE_CHECKING, Literal


-def get_active_dictionary(self: "BIMBSDDProperties", context: object) -> tool.Blender.BLENDER_ENUM_ITEMS:
+def get_active_dictionary(self, context):
    if not BSDDData.is_loaded:
        BSDDData.load()
    return BSDDData.data["active_dictionary"]


 def update_is_active(self: "BSDDDictionary", context: bpy.types.Context) -> None:
-    tool.Bsdd.save_active_bsdd_to_ifc()
-
-    BSDDData.data["active_dictionary"] = BSDDData.active_dictionary()
-    if ClassificationsData.is_loaded:
-        props = tool.Classification.get_classification_props()
-        # Preserve original enum value.
-        classification_source = props.classification_source
-        ClassificationsData.data["classification_source"] = ClassificationsData.classification_source()
-
-        # Try to restore enum value.
-        if "classification_source" not in props:
-            # It's already on the default value, nothing to restore.
-            return
-        try:
-            props.classification_source = classification_source
-        except TypeError:
-            # Item is no longer active and not present in enum, fallback to the default.
-            del props["classification_source"]
-
-
-def update_is_selected(self: "BSDDProperty", context: bpy.types.Context) -> None:
-    tool.Bsdd.import_selected_properties()
-
-
-def update_active_class_index(self: "BIMBSDDProperties", context: bpy.types.Context) -> None:
-    tool.Bsdd.import_class_properties()
    BSDDData.data["active_dictionary"] = BSDDData.active_dictionary()


 class BSDDDictionary(PropertyGroup):
+    name: StringProperty(name="Name")
    uri: StringProperty(name="URI")
    default_language_code: StringProperty(name="Language")
    organization_name_owner: StringProperty(name="Organization")
    status: StringProperty(name="Status")
    version: StringProperty(name="Version")
    is_active: BoolProperty(
-        name="Is Active",
-        description="Enable to search with this dictionary",
-        default=False,
-        update=update_is_active,
+        name="Is Active", description="Enable to search with this dictionary", default=False, update=update_is_active
    )

-    if TYPE_CHECKING:
-        uri: str
-        default_language_code: str
-        organization_name_owner: str
-        status: str
-        version: str
-        is_active: bool
-

 class BSDDClassification(PropertyGroup):
+    name: StringProperty(name="Name")
    reference_code: StringProperty(name="Reference Code")
-    uri: StringProperty(name="URI")
+    uri: StringProperty(name="Namespace URI")
    dictionary_name: StringProperty(name="Dictionary Name")
    dictionary_namespace_uri: StringProperty(name="Dictionary Namespace URI")

-    if TYPE_CHECKING:
-        reference_code: str
-        uri: str
-        dictionary_name: str
-        dictionary_namespace_uri: str
-
-
-class BSDDProperty(PropertyGroup):
-    code: StringProperty(name="Code")
-    uri: StringProperty(name="URI")
-    pset: StringProperty(name="Pset")
-    is_selected: BoolProperty(
-        name="Is Selected", description="Select to add or edit this property", default=False, update=update_is_selected
-    )
-
-    if TYPE_CHECKING:
-        code: str
-        uri: str
-        pset: str
-        is_selected: bool
-

 class BSDDPset(PropertyGroup):
+    name: StringProperty(name="Name")
    properties: CollectionProperty(name="Properties", type=Attribute)

-    if TYPE_CHECKING:
-        properties: bpy.types.bpy_prop_collection_idprop[Attribute]
-

 class BIMBSDDProperties(PropertyGroup):
-    # TODO: `active_dictionary` is not used anywhere?
+    active_dictionary: StringProperty(name="Active Dictionary")
    active_dictionary: EnumProperty(items=get_active_dictionary, name="Active Dictionary")
    active_uri: StringProperty(name="Active URI")
    dictionaries: CollectionProperty(name="Dictionaries", type=BSDDDictionary)
    active_dictionary_index: IntProperty(name="Active Dictionary Index")
    classifications: CollectionProperty(name="Classifications", type=BSDDClassification)
    active_classification_index: IntProperty(name="Active Classification Index")
-    property_filter_mode: EnumProperty(
-        name="Property Filter Mode",
-        items=[
-            ("CLASS", "By Class", "Browse properties by class or group"),
-            ("KEYWORD", "By Keyword", "Search properties directly using a keyword"),
-        ],
-        default="CLASS",
-    )
-    classes: CollectionProperty(name="Classes", type=BSDDClassification)
-    active_class_index: IntProperty(name="Active Class Index", update=update_active_class_index)
-    properties: CollectionProperty(name="Properties", type=BSDDProperty)
-    active_property_index: IntProperty(name="Active Property Index")
-    selected_properties: CollectionProperty(name="Selected Properties", type=Attribute)
    keyword: StringProperty(name="Keyword", description="Query for bsdd classes search, case and accent insensitive")
    should_filter_ifc_class: BoolProperty(
        name="Filter Active IFC Class",
@@ -160,27 +86,13 @@ class BIMBSDDProperties(PropertyGroup):
        description="Whether to display and assign only properties from IFC dictionary",
        default=False,
    )
+    load_preview_dictionaries: BoolProperty(
+        name="Load Preview Dictionaries", description="Load dictionaries marked as Preview status", default=False
+    )
+    load_inactive_dictionaries: BoolProperty(
+        name="Load Inactive Dictionaries", description="Load dictionaries marked as Inactive status", default=False
+    )
+    load_test_dictionaries: BoolProperty(
+        name="Load Test Dictionaries", description="Load dictionaries that are for testing only", default=False
+    )
    classification_psets: CollectionProperty(name="Classification Psets", type=BSDDPset)
-
-    if TYPE_CHECKING:
-        active_dictionary: str
-        active_dictionary: str
-        active_uri: str
-        dictionaries: bpy.types.bpy_prop_collection_idprop[BSDDDictionary]
-        active_dictionary_index: int
-        classifications: bpy.types.bpy_prop_collection_idprop[BSDDClassification]
-        active_classification_index: int
-        property_filter_mode: Literal["CLASS", "KEYWORD"]
-        classes: bpy.types.bpy_prop_collection_idprop[BSDDClassification]
-        active_class_index: int
-        properties: bpy.types.bpy_prop_collection_idprop[BSDDProperty]
-        active_property_index: int
-        selected_properties: bpy.types.bpy_prop_collection_idprop[Attribute]
-        keyword: str
-        should_filter_ifc_class: bool
-        use_only_ifc_properties: bool
-        classification_psets: bpy.types.bpy_prop_collection_idprop[BSDDPset]
-
-    @property
-    def active_class(self) -> Union[BSDDClassification, None]:
-        return tool.Blender.get_active_uilist_element(self.classes, self.active_class_index)
@@ -16,15 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

-from __future__ import annotations
-import bpy
 import bonsai.tool as tool
 from bonsai.bim.module.bsdd.data import BSDDData
 from bpy.types import Panel, UIList
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from bonsai.bim.module.bsdd.prop import BIMBSDDProperties, BSDDDictionary, BSDDClassification, BSDDProperty


 class BIM_PT_bsdd(Panel):
@@ -39,8 +33,7 @@ class BIM_PT_bsdd(Panel):
    def draw(self, context):
        if not BSDDData.is_loaded:
            BSDDData.load()
-        props = tool.Bsdd.get_bsdd_props()
-        assert self.layout
+        props = context.scene.BIMBSDDProperties
        layout = self.layout
        if len(props.dictionaries):
            row = self.layout.row()
@@ -61,7 +54,7 @@ class BIM_PT_bsdd(Panel):
                selected_dictionary = None

            if selected_dictionary:
-                layout.label(text="Selected Dictionary:")
+                layout.label(text="Selected dictionary:")
                box = layout.box()
                row = box.row(align=True)
                row.label(text="Language")
@@ -77,17 +70,9 @@ class BIM_PT_bsdd(Panel):


 class BIM_UL_bsdd_dictionaries(UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMBSDDProperties,
-        item: BSDDDictionary,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
        if item:
+            props = context.scene.BIMBSDDProperties
            row = layout.row(align=True)
            if item.status != "Active":
                row.label(
@@ -101,65 +86,9 @@ class BIM_UL_bsdd_dictionaries(UIList):


 class BIM_UL_bsdd_classifications(UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMBSDDProperties,
-        item: BSDDClassification,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
        if item:
            row = layout.row(align=True)
            row.label(text=item.reference_code)
            row.label(text=item.name)
            row.operator("bim.open_uri", text="", icon="URL").uri = item.uri
-
-
-class BIM_UL_bsdd_classes(UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMBSDDProperties,
-        item: BSDDClassification,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
-        if item:
-            row = layout.row(align=True)
-            row.label(text=item.name)
-            row.operator("bim.open_uri", text="", icon="URL").uri = item.uri
-
-
-class BIM_UL_bsdd_properties(UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMBSDDProperties,
-        item: BSDDProperty,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
-        if item:
-            layout.context_pointer_set("active_bsdd_property", item)  # used for context menu
-            row = layout.row(align=True)
-            name = item.name
-            if name != item.code:
-                name += f" ({item.code})"
-            row.label(text=name)
-            if item.pset:
-                row.label(text=item.pset)
-            row.operator("bim.open_uri", text="", icon="URL").uri = item.uri
-            row.prop(
-                item,
-                "is_selected",
-                icon="CHECKBOX_HLT" if item.is_selected else "CHECKBOX_DEHLT",
-                text="",
-                emboss=False,
-            )
@@ -177,7 +177,7 @@ class CadFillet(bpy.types.Operator):
            selected_edges.append(cut_edges[1])

        # Calculate the distance to slide each edge to make space for the fillet arc
-        shared_vert = next(iter(set(selected_edges[0].verts) & set(selected_edges[1].verts)))
+        shared_vert = list(set(selected_edges[0].verts) & set(selected_edges[1].verts))[0]
        v1 = selected_edges[0].other_vert(shared_vert)
        v2 = selected_edges[1].other_vert(shared_vert)
        dir1 = (v1.co - shared_vert.co).normalized()
@@ -205,7 +205,7 @@ class CadFillet(bpy.types.Operator):
        # If faces are involved, then the chamfer edge protects existing faces from the newly created fillet.
        # If no faces are involved, we delete the chamfer edge.
        if is_wire:
-            chamfer_edge = next(e for e in bm.edges if shared_vert in e.verts and v2 in e.verts)
+            chamfer_edge = [e for e in bm.edges if shared_vert in e.verts and v2 in e.verts][0]
            bm.edges.remove(chamfer_edge)

        bm.verts.index_update()
@@ -675,7 +675,7 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
        bm = bmesh.from_edit_mesh(self.mesh)
        edges = [e for e in bm.edges if e.select and not e.hide]

-        mid = next(iter(set(edges[0].verts) & set(edges[1].verts)))
+        mid = list(set(edges[0].verts) & set(edges[1].verts))[0]
        v1 = edges[0].other_vert(mid)
        v2 = edges[1].other_vert(mid)
        assert v1 and v2
@@ -738,7 +738,7 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
        bmesh.ops.remove_doubles(bm, verts=all_verts, dist=1e-4)

        # Calculate the distance to slide each edge to make space for the fillet arc
-        shared_vert = next(iter(set(selected_edges[0].verts) & set(selected_edges[1].verts)))
+        shared_vert = list(set(selected_edges[0].verts) & set(selected_edges[1].verts))[0]
        v1 = selected_edges[0].other_vert(shared_vert)
        v2 = selected_edges[1].other_vert(shared_vert)
        assert v1 and v2
@@ -19,19 +19,16 @@
 import os
 import bpy
 import json
-import tempfile
 import bmesh
 import logging
 import numpy as np
 import ifcopenshell
 import bonsai.tool as tool
-from pathlib import Path
 from bpy_extras.io_utils import ExportHelper, ImportHelper
 from math import radians
 from mathutils import Matrix, Vector
 from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.clash.decorator import ClashDecorator
-from typing import TYPE_CHECKING


 class ExportClashSets(bpy.types.Operator, ExportHelper):
@@ -130,8 +127,7 @@ class AddClashSource(bpy.types.Operator):
    def execute(self, context):
        props = tool.Clash.get_clash_props()
        clash_set = props.active_clash_set
-        assert clash_set
-        clash_set.get_clash_sources_group(self.group).add()
+        source = getattr(clash_set, self.group).add()
        return {"FINISHED"}


@@ -146,8 +142,7 @@ class RemoveClashSource(bpy.types.Operator):
    def execute(self, context):
        props = tool.Clash.get_clash_props()
        clash_set = props.active_clash_set
-        assert clash_set
-        clash_set.get_clash_sources_group(self.group).remove(self.index)
+        getattr(clash_set, self.group).remove(self.index)
        return {"FINISHED"}


@@ -157,16 +152,14 @@ class SelectClashSource(bpy.types.Operator, ImportHelper):
    bl_options = {"REGISTER", "UNDO"}
    bl_description = "Select an IFC file to add as a clash source"
    filter_glob: bpy.props.StringProperty(default="*.ifc", options={"HIDDEN"})
-    index: bpy.props.IntProperty(options={"HIDDEN"})
-    group: bpy.props.StringProperty(options={"HIDDEN"})
+    index: bpy.props.IntProperty()
+    group: bpy.props.StringProperty()
    filename_ext = ".ifc"

    def execute(self, context):
        props = tool.Clash.get_clash_props()
        clash_set = props.active_clash_set
-        assert clash_set
-        clash_source = clash_set.get_clash_sources_group(self.group)[self.index]
-        clash_source.name = self.filepath
+        getattr(clash_set, self.group)[self.index].name = self.filepath
        return {"FINISHED"}


@@ -197,39 +190,16 @@ class SelectSmartGroupedClashesPath(bpy.types.Operator, ImportHelper):
 class ExecuteIfcClash(bpy.types.Operator, ExportHelper):
    bl_idname = "bim.execute_ifc_clash"
    bl_label = "Execute IFC Clash"
-    bl_description = (
-        "Execute clash detection and save the information to a .bcf or .json file.\n\n"
-        "ALT+click to run a quick clash without selecting a file to save."
-    )
-
-    filter_glob: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
-        default="*.bcf;*.json", options={"HIDDEN"}
-    )
-    format: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
-        name="Format", items=[(i, i, "") for i in ("bcf", "json")]
-    )
-    filepath: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
-        subtype="FILE_PATH", options={"SKIP_SAVE"}
-    )
-    quick_clash: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
-        options={"SKIP_SAVE"},
-    )
-
-    if TYPE_CHECKING:
-        filter_glob: str
-        format: str
-        filepath: str
-        quick_clash: bool
+    bl_description = "Execute clash detection and save the information to a .bcf or .json file"
+    filter_glob: bpy.props.StringProperty(default="*.bcf;*.json", options={"HIDDEN"})
+    format: bpy.props.EnumProperty(name="Format", items=[(i, i, "") for i in ("bcf", "json")])
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH", options={"SKIP_SAVE"})

    @property
    def filename_ext(self) -> str:
        return f".{self.format.lower()}"

    def invoke(self, context, event):
-        if event.alt:
-            self.quick_clash = True
-            return self.execute(context)
-
        if self.filepath:
            return self.execute(context)
        return ExportHelper.invoke(self, context, event)
@@ -239,32 +209,14 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):

        self.props = tool.Clash.get_clash_props()

-        for clash_set in self.props.clash_sets:
-            for clash_sources in clash_set.get_clash_sources().values():
-                for clash_source in clash_sources:
-                    if not Path(clash_source.name).is_file():
-                        self.report(
-                            {"ERROR"},
-                            f"One of the provided clash source filepaths do not exist: '{clash_source.name}'.",
-                        )
-                        return {"CANCELLED"}
-
-        temp_file = None
-        if self.quick_clash:
-            temp_file = tempfile.NamedTemporaryFile(suffix=".json", delete=False, mode="w")
-            temp_file.close()
-            extension = ".json"
-            self.filepath = temp_file.name
-        else:
-            extension = Path(self.filepath).suffix.lower()
-            if extension != ".bcf":
-                self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
-            # TODO Temporarily until BCF support comes back
-            if extension != ".json":
-                self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")
-            assert extension in (".bcf", ".json")
-            self.props.export_path = self.filepath
+        _, extension = os.path.splitext(self.filepath)
+        if extension != ".bcf":
+            self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
+        # TODO Temporarily until BCF support comes back
+        if extension != ".json":
+            self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")

+        self.props.export_path = self.filepath
        settings = ifcclash.ClashSettings()
        settings.output = self.filepath
        settings.logger = logging.getLogger("Clash")
@@ -273,14 +225,11 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):

        if self.props.should_create_clash_snapshots:

-            def get_viewpoint_snapshot(viewpoint) -> tuple[str, bytes]:
-                assert context.scene
-
+            def get_viewpoint_snapshot(viewpoint):
                camera = bpy.data.objects.get("IFC Clash Camera")
                if not camera:
                    camera = bpy.data.objects.new("IFC Clash Camera", bpy.data.cameras.new("IFC Clash Camera"))
                    context.scene.collection.objects.link(camera)
-                assert isinstance(camera.data, bpy.types.Camera)

                bcf_camera = viewpoint.visualization_info.perspective_camera
                p = bcf_camera.camera_view_point
@@ -289,7 +238,6 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):
                y = bcf_camera.camera_up_vector
                y = Vector([y.x, y.y, y.z])
                x = y.cross(z)
-                assert isinstance(x, Vector)

                mat = Matrix(
                    [
@@ -303,9 +251,9 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):
                camera.matrix_world = mat
                context.scene.camera = camera
                camera.data.angle = radians(60)
-                assert (space := tool.Blender.get_view3d_space()) and space.region_3d
-                space.region_3d.view_perspective = "CAMERA"
-                space.shading.show_xray = True
+                area = next(area for area in context.screen.areas if area.type == "VIEW_3D")
+                area.spaces[0].region_3d.view_perspective = "CAMERA"
+                area.spaces[0].shading.show_xray = True
                context.scene.render.resolution_x = 480
                context.scene.render.resolution_y = 270
                context.scene.render.image_settings.file_format = "PNG"
@@ -320,26 +268,10 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):
        clasher.clash()
        clasher.export()

-        # Load clash results to UI.
-        if extension == ".bcf":
-            with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
-                try:
-                    tmp.close()
-                    settings.output = tmp.name
-                    clasher.export()
-                    tool.Clash.load_clash_sets(tmp.name)
-                finally:
-                    Path(tmp.name).unlink()
-        else:
+        if extension == ".json":
            tool.Clash.load_clash_sets(self.filepath)
-        tool.Clash.import_active_clashes()
-
-        if self.quick_clash:
-            assert temp_file is not None
-            Path(temp_file.name).unlink()
-            self.report({"INFO"}, "IFC Clash completed and results are loaded.")
-        else:
-            self.report({"INFO"}, f"IFC Clash results are saved to '{Path(self.filepath).name}'.")
+            tool.Clash.import_active_clashes()
+        self.report({"INFO"}, "Finished IFC clash.")
        return {"FINISHED"}


@@ -416,16 +348,14 @@ class SelectClash(bpy.types.Operator):

    def execute(self, context):
        self.props = tool.Clash.get_clash_props()
-        assert (active_clash := self.props.active_clash)
-        assert (active_clash_set := self.props.active_clash_set)
-        clash_set = tool.Clash.get_clash_set(active_clash_set.name)
-        assert clash_set
+        clash_set = tool.Clash.get_clash_set(self.props.active_clash_set.name)
+        active_clash = self.props.active_clash
        clash = tool.Clash.get_clash(clash_set, active_clash.a_global_id, active_clash.b_global_id)

        if not clash:
            return {"FINISHED"}

-        products: list[ifcopenshell.entity_instance] = []
+        products = []

        for global_id in (clash["a_global_id"], clash["b_global_id"]):
            try:
@@ -30,18 +30,14 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
-from ifcopenshell.geom.main import ClashType, CLASH_TYPE_ITEMS
 from mathutils import Vector
 from typing import TYPE_CHECKING, Literal, Union


 class ClashSource(PropertyGroup):
-    name: StringProperty(  # pyright: ignore[reportRedeclaration]
-        name="File",
-        description="Absolute filepath to existing .ifc file to use as a clash source.",
-    )
-    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")  # pyright: ignore[reportRedeclaration]
-    mode: EnumProperty(  # pyright: ignore[reportRedeclaration]
+    name: StringProperty(name="File")
+    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")
+    mode: EnumProperty(
        items=[
            ("a", "All Elements", "All elements will be used for clashing"),
            ("i", "Include", "Only the selected elements are included for clashing"),
@@ -51,7 +47,6 @@ class ClashSource(PropertyGroup):
    )

    if TYPE_CHECKING:
-        name: str
        filter_groups: bpy.types.bpy_prop_collection_idprop[BIMFilterGroup]
        mode: Literal["a", "i", "e"]

@@ -61,31 +56,16 @@ class Clash(PropertyGroup):
    b_global_id: StringProperty(name="B")
    a_name: StringProperty(name="A Name")
    b_name: StringProperty(name="B Name")
-    clash_type: EnumProperty(  # pyright: ignore[reportRedeclaration]
-        name="Clash Type",
-        items=tuple((i, i, "") for i in CLASH_TYPE_ITEMS),
-    )
-    status: BoolProperty(
-        name="Status",
-        description="Clash status, not stored anywhere - currently just displayed in UI for convenience.",
-        default=False,
-    )
+    status: BoolProperty(name="Status", default=False)

    if TYPE_CHECKING:
        a_global_id: str
        b_global_id: str
        a_name: str
        b_name: str
-        clash_type: ClashType
        status: bool


-def clashes_loaded_update(self: "ClashSet", context: bpy.types.Context) -> None:
-    if self.clashes_loaded:
-        return
-    tool.Clash.clear_active_clash_set_results()
-
-
 class ClashSet(PropertyGroup):
    mode: EnumProperty(
        items=[
@@ -101,18 +81,13 @@ class ClashSet(PropertyGroup):
        ],
        name="Mode",
    )
-    tolerance: FloatProperty(name="Tolerance", default=0.002, subtype="DISTANCE")
-    clearance: FloatProperty(name="Clearance", default=0.01, subtype="DISTANCE")
+    tolerance: FloatProperty(name="Tolerance", default=0.002)
+    clearance: FloatProperty(name="Clearance", default=0.01)
    allow_touching: BoolProperty(name="Allow Touching", default=False)
    check_all: BoolProperty(name="Check All", default=False)
    a: CollectionProperty(name="Group A", type=ClashSource)
    b: CollectionProperty(name="Group B", type=ClashSource)
    clashes: CollectionProperty(name="Clashes", type=Clash)
-    clashes_loaded: BoolProperty(
-        name="Clash Results Are Loaded",
-        description="Click to unload clash results for the clash set.",
-        update=clashes_loaded_update,
-    )

    if TYPE_CHECKING:
        mode: Literal["intersection", "collision", "clearance"]
@@ -123,17 +98,6 @@ class ClashSet(PropertyGroup):
        a: bpy.types.bpy_prop_collection_idprop[ClashSource]
        b: bpy.types.bpy_prop_collection_idprop[ClashSource]
        clashes: bpy.types.bpy_prop_collection_idprop[Clash]
-        clashes_loaded: bool
-
-    def get_clash_sources_group(
-        self, group: tool.Clash.ClashSourceGroup
-    ) -> "bpy.types.bpy_prop_collection_idprop[ClashSource]":
-        return getattr(self, group)
-
-    def get_clash_sources(
-        self,
-    ) -> "dict[tool.Clash.ClashSourceGroup, bpy.types.bpy_prop_collection_idprop[ClashSource]]":
-        return {g: self.get_clash_sources_group(g) for g in tool.Clash.CLASH_SOURCE_GROUP_LITERALS}


 class SmartClashGroup(PropertyGroup):
@@ -16,16 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

-from __future__ import annotations
 import bpy
 import bonsai.tool as tool
 import bonsai.bim.helper
 from bpy.types import Panel
 from bonsai.bim.module.clash.data import ClashData
-from typing import TYPE_CHECKING, assert_never
-
-if TYPE_CHECKING:
-    from bonsai.bim.module.clash.prop import BIMClashProperties, ClashSet, SmartClashGroup, Clash


 class BIM_PT_ifcclash(Panel):
@@ -41,7 +36,6 @@ class BIM_PT_ifcclash(Panel):
        if not ClashData.is_loaded:
            ClashData.load()

-        assert self.layout
        layout = self.layout
        props = tool.Clash.get_clash_props()

@@ -80,62 +74,46 @@ class BIM_PT_ifcclash(Panel):
            row.prop(clash_set, "clearance")
            row = layout.row()
            row.prop(clash_set, "check_all")
-        else:
-            assert_never(clash_set.mode)

-        def draw_clash_set_group(group: tool.Clash.ClashSourceGroup) -> None:
+        row = layout.row(align=True)
+        row.label(text="Group A:", icon="OUTLINER_OB_POINTCLOUD")
+        row.operator("bim.add_clash_source", icon="ADD", text="").group = "a"
+
+        for index, source in enumerate(clash_set.a):
            row = layout.row(align=True)
-            row.label(text=f"Group {group.upper()}:", icon="OUTLINER_OB_POINTCLOUD")
-            row.operator("bim.add_clash_source", icon="ADD", text="").group = group
+            row.prop(source, "name", text="")
+            row.prop(source, "mode", text="")
+            op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
+            op.index = index
+            op.group = "a"
+            op = row.operator("bim.remove_clash_source", icon="X", text="")
+            op.index = index
+            op.group = "a"

-            sources = clash_set.get_clash_sources_group(group)
-            if not sources:
-                return
-            layout_ = layout.box()
-            for index, source in enumerate(sources):
-                row = layout_.row(align=True)
-                row.column().label(text="", icon="POINTCLOUD_POINT")
+            if source.mode != "a":
+                bonsai.bim.helper.draw_filter(
+                    layout, source.filter_groups, ClashData, f"clash_{props.active_clash_set_index}_a_{index}"
+                )

-                # Draw user attention to empty filepaths.
-                col = row.column()
-                col.alert = not bool(source.name)
-                col.prop(source, "name", text="", placeholder="source.ifc")
+        row = layout.row(align=True)
+        row.label(text="Group B:", icon="OUTLINER_OB_POINTCLOUD")
+        row.operator("bim.add_clash_source", icon="ADD", text="").group = "b"

-                op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
-                op.index = index
-                op.group = group
-                # Make sure file selection sticks to "name" field.
-                row.label(text="", icon="BLANK1")
+        for index, source in enumerate(clash_set.b):
+            row = layout.row(align=True)
+            row.prop(source, "name", text="")
+            row.prop(source, "mode", text="")
+            op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
+            op.index = index
+            op.group = "b"
+            op = row.operator("bim.remove_clash_source", icon="X", text="")
+            op.index = index
+            op.group = "b"

-                row.prop(source, "mode", text="")
-                op = row.operator("bim.remove_clash_source", icon="X", text="")
-                op.index = index
-                op.group = group
-
-                if source.mode != "a":
-
-                    def draw_filter(layout: bpy.types.UILayout, context: bpy.types.Context) -> None:
-                        bonsai.bim.helper.draw_filter(
-                            layout,
-                            source.filter_groups,
-                            ClashData,
-                            f"clash_{props.active_clash_set_index}_{group}_{index}",
-                        )
-
-                    bonsai.bim.helper.draw_expandable_panel(
-                        layout_,
-                        context,
-                        "Filter",
-                        draw_filter,
-                        default_closed=True,
-                        panel_id=f"filter_{group}_{index}",
-                    )
-
-        layout.separator()
-        draw_clash_set_group("a")
-        layout.separator()
-        draw_clash_set_group("b")
-        layout.separator()
+            if source.mode != "a":
+                bonsai.bim.helper.draw_filter(
+                    layout, source.filter_groups, ClashData, f"clash_{props.active_clash_set_index}_b_{index}"
+                )

        row = layout.row()
        row.prop(props, "should_create_clash_snapshots")
@@ -147,26 +125,11 @@ class BIM_PT_ifcclash(Panel):
        op.filepath = props.export_path

        row = layout.row()
-        if clash_set.clashes_loaded:
-            row.column().label(text=f"{len(clash_set.clashes)} Clashes Found", icon="PIVOT_CURSOR")
+        row.label(text=f"{len(clash_set.clashes)} Clashes Found", icon="PIVOT_CURSOR")

-            col = row.column()
-            col.alignment = "RIGHT"
-            col.prop(clash_set, "clashes_loaded", text="", icon="TRASH", invert_checkbox=True)
-
-            split = layout.split(factor=0.07, align=True)
-            split.label(text="#")
-
-            row = split.row(align=True)
-            row.label(text="Group A Element")
-            row.label(text="Group B Element")
-            row.label(text="Type")
-
-            layout.template_list("BIM_UL_clashes", "", props.active_clash_set, "clashes", props, "active_clash_index")
-            row = layout.row()
-            row.operator("bim.select_clash")
-        else:
-            row.label(text="Clashes Are Not Loaded", icon="PIVOT_CURSOR")
+        layout.template_list("BIM_UL_clashes", "", props.active_clash_set, "clashes", props, "active_clash_index")
+        row = layout.row()
+        row.operator("bim.select_clash")


 class BIM_PT_clash_manager(Panel):
@@ -192,7 +155,6 @@ class BIM_PT_smart_clash_manager(Panel):
    bl_parent_id = "BIM_PT_clash_manager"

    def draw(self, context):
-        assert self.layout
        layout = self.layout
        props = tool.Clash.get_clash_props()

@@ -226,16 +188,8 @@ class BIM_PT_smart_clash_manager(Panel):


 class BIM_UL_clash_sets(bpy.types.UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMClashProperties,
-        item: ClashSet,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        ob = data
        if item:
            layout.prop(item, "name", text="", emboss=False)
        else:
@@ -243,16 +197,8 @@ class BIM_UL_clash_sets(bpy.types.UIList):


 class BIM_UL_smart_groups(bpy.types.UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMClashProperties,
-        item: SmartClashGroup,
-        icon,
-        active_data,
-        active_propname,
-    ) -> None:
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        ob = data
        if item:
            layout.label(text=str(item.number), translate=False, icon="NONE", icon_value=0)
        else:
@@ -260,30 +206,11 @@ class BIM_UL_smart_groups(bpy.types.UIList):


 class BIM_UL_clashes(bpy.types.UIList):
-    def draw_item(
-        self,
-        context,
-        layout: bpy.types.UILayout,
-        data: BIMClashProperties,
-        item: Clash,
-        icon,
-        active_data,
-        active_propname,
-        index,
-        fit_flag,
-    ) -> None:
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
        if item:
-            split = layout.split(factor=0.05, align=True)
-            split.label(text=str(index + 1))
-
-            row = split.row(align=False)
+            row = layout.row(align=True)
            row.label(text=str(item.a_name), translate=False, icon="NONE", icon_value=0)
            row.label(text=str(item.b_name), translate=False, icon="NONE", icon_value=0)
-
-            col = row.column()
-            col.enabled = False
-            col.prop(item, "clash_type", text="")
-
            row.prop(item, "status", text="")
        else:
            layout.label(text="", translate=False)
@@ -48,7 +48,6 @@ classes = (
    ui.BIM_PT_classification_references,
    ui.BIM_PT_material_classifications,
    ui.BIM_PT_cost_classifications,
-    ui.BIM_PT_zone_classifications,
    ui.BIM_UL_classifications,
 )

--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .8.4
 .8.3
				`@@ -1 +0,0 @@`
				`SVG [mustache](https://mustache.github.io/) templates that will be used for sheets and fill be filled with infromation from the sheet's IfcDocumentInformation attributes (e.g. Identification, Name, Revision, etc).`