See #5087. See #5114. Skip trying to test shapes that obviously don't have a representation to prevent false positives

Looks like a simple typo, closes #5131

.github/workflows/ci-bcf-pypi.yml

@@ -32,7 +32,7 @@ jobs:
         run: |
           pip install build
           cd src/bcf &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

@@ -0,0 +1,12 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable

.github/workflows/ci-blenderbim-daily.yml

@@ -3,10 +3,10 @@ name: ci-blenderbim-daily
 on:
   push:
     paths:
-      - '.github/workflows/ci-blenderbim-matrix.yml'
+      - '.github/workflows/ci-blenderbim-daily.yml'
       - 'src/blenderbim/**'
       - 'src/ifcopenshell-python/ifcopenshell/**'
-      - 'src/bcf/src/bcf/**'
+      - 'src/bcf/bcf/**'
       - 'src/ifcclash/ifcclash/**'
       - 'src/ifccobie/**'
       - 'src/ifcdiff/**'
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py310, py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -43,15 +43,15 @@ jobs:
           }
           - {
             name: "Linux Build",
-            short_name: linux
+            short_name: linux,
           }
           - {
             name: "MacOS Build",
-            short_name: macos
+            short_name: macos,
           }
           - {
             name: "MacOS ARM Build",
-            short_name: macosm1
+            short_name: macosm1,
           }
     steps:
       - uses: actions/checkout@v2
@@ -67,15 +67,19 @@ jobs:
         run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
-          cp -r src/blenderbim src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          cd src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+          cd src/blenderbim && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+      - name: Find zip file name
+        id: find_zip
+        run: |
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
+          echo "filepath=$filepath" >> $GITHUB_OUTPUT
+          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
       - name: Upload zip file to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          asset_name: blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          release_name: "blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}} (unstable)"
-          tag: "blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}"
+          file: ${{ steps.find_zip.outputs.filepath }}
+          asset_name: ${{ steps.find_zip.outputs.filename }}
+          release_name: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
+          tag: "blenderbim-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
           overwrite: true

.github/workflows/ci-blenderbim.yml

@@ -1,5 +1,10 @@
 name: ci-blenderbim
 
+# Differences from ci-blenderbim-daily.yml:
+# - make has IS_STABLE=TRUE
+# - action is never triggered and executed only manually
+# - doesn't add a current date to the release and tag
+
 on:
   workflow_dispatch:
 
@@ -19,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py310, py311, py312]
         config:
           - {
             name: "Windows Build",
@@ -48,15 +53,20 @@ jobs:
         run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
       - name: Compile
         run: |
-          cp -r src/blenderbim src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          cd src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          cd src/blenderbim &&
           make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+      - name: Find zip file name
+        id: find_zip
+        run: |
+          filepath=$(ls src/blenderbim/dist/blenderbim_*.zip)
+          echo "filepath=$filepath" >> $GITHUB_OUTPUT
+          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
       - name: Upload zip file to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.version.outputs.version}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          asset_name: blenderbim-${{steps.version.outputs.version}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
+          file: ${{ steps.find_zip.outputs.filepath }}
+          asset_name: ${{ steps.find_zip.outputs.filename }}
           release_name: "blenderbim-${{steps.version.outputs.version}}"
           tag: "blenderbim-${{steps.version.outputs.version}}"
           overwrite: true

.github/workflows/ci-bsdd-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/bsdd &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifc4d-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifc4d &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifc5d-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifc5d &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifccityjson-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifccityjson &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcclash-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcclash &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcconvert.yml

@@ -0,0 +1,65 @@
+name: ci-ifcconvert
+
+on:
+  workflow_dispatch:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+
+  build:
+    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {
+            name: "Windows 64bit",
+            short_name: win64,
+          }
+          - {
+            name: "Windows 32bit",
+            short_name: win32,
+          }
+          - {
+            name: "Linux 64bit",
+            short_name: linux64
+          }
+          - {
+            name: "MacOS Intel 64bit",
+            short_name: macos64
+          }
+          - {
+            name: "MacOS Silicon 64bit",
+            short_name: macosm164
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - 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
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+      - run: echo ${{ env.DATE }}
+      - name: Get current version
+        id: version
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - name: Compile
+        run: |
+          cd src/ifcopenshell-python &&
+          make zip-ifcconvert PLATFORM=${{ matrix.config.short_name }}
+      - name: Upload zip file to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: src/ifcopenshell-python/dist/ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
+          asset_name: ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
+          release_name: "ifcconvert-${{steps.version.outputs.version}}"
+          tag: "ifcconvert-${{steps.version.outputs.version}}"
+          overwrite: true

.github/workflows/ci-ifccsv-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifccsv &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcdiff-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcdiff &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcfm-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcfm &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcopenshell-conda-cleaner.yml

@@ -90,7 +90,10 @@ jobs:
                   return
           
               # sort the versions in descending order
-              versions = sorted(versions, reverse=True)
+              print(f"Before reversal: {versions=}")
+              versions.reverse()
+              print(f"After reversal: {versions=}")
+          
               releases = versions[number_of_supported_versions:]
           
               for release in releases:

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Version + date str
         id: verdate
-        run: echo "verdate='${{ steps.version.outputs.version }}.${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
+        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
 
       
   test:

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

@@ -57,7 +57,7 @@ jobs:
           pip install build
           cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
           cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcpatch-pypi.yaml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcpatch &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifctester-pypi.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           pip install build
           cd src/ifctester &&
-          make dist
+          make dist IS_STABLE=TRUE
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci.yml

@@ -47,6 +47,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
+          pip install mathutils
           pip install src/bcf --no-deps
           pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
 
@@ -125,4 +126,9 @@ jobs:
           python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test-safe
+          make test
+          cd ../bcf && make test
+          pip install requests
+          cd ../bsdd && make test
+          cd ../ifcpatch && make test
+          cd ../ifctester && make test

README.md

@@ -46,12 +46,12 @@ Contents
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
 | ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
 | ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
-| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html)
+| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
 | ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
 | ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
 | ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
 | ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
+| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
 | ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
 | ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
 | ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |

VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

cmake/CMakeLists.txt

@@ -221,10 +221,11 @@ endif()
 
 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
     UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    find_file(json_hpp "json.hpp" ${JSON_INCLUDE_DIR}/nlohmann)
+    find_path(json_header_path "json.hpp" ${JSON_INCLUDE_DIR} PATH_SUFFIXES "nlohmann")
+    set(JSON_INCLUDE_DIR ${json_header_path})
 
-    if(json_hpp)
-        message(STATUS "JSON for Modern C++ header file found")
+    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()

pyproject.toml

@@ -1,5 +1,34 @@
 [tool.black]
 line-length = 120
+include = '''
+    src/(
+        bcf
+        |bcfserver
+        |blenderbim
+        |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/*
+    |src/ifcopenshell-python/ifcopenshell/mvd/*
+    |src/ifc2ca/templates/*
+'''
 
 [tool.pyright]
 reportInvalidTypeForm = false

src/bcf/Makefile

@@ -16,11 +16,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with BCF.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION:=$(shell cat ../../VERSION)
-SED:=sed -i
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
+PACKAGE_NAME:=bcf
+include ../common.mk
 
 .PHONY: ci
 ci:
@@ -36,16 +33,9 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
 
-.PHONY: dist
-dist:
-	rm -rf dist
-	cp pyproject.toml pyproject.toml.bak
-	cp src/bcf/__init__.py __init__.py.bak
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml
-	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' src/bcf/__init__.py
-	python -m build
-	mv pyproject.toml.bak pyproject.toml
-	mv __init__.py.bak src/bcf/__init__.py
+.PHONY: test
+test:
+	pytest -p no:pytest-blender tests
 
 # .PHONY
 # api:

src/bcf/bcf/bcfxml.py

@@ -18,6 +18,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with BCF.  If not, see <http://www.gnu.org/licenses/>.
 """
+
 import zipfile
 from pathlib import Path
 from typing import Optional, Union

src/bcf/bcf/geometry.py

@@ -5,8 +5,8 @@ from numpy.typing import NDArray
 
 
 def camera_vectors_from_element_placement(
-    elem_placement: NDArray[np.float_],
-) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
+    elem_placement: NDArray[np.float64],
+) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
     """
     Calculate the vectors of a camera pointing to an element.
 
@@ -21,8 +21,8 @@ def camera_vectors_from_element_placement(
 
 
 def camera_vectors_from_target_position(
-    target_position: NDArray[np.float_], offset: Optional[NDArray[np.float_]] = None
-) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
+    target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None
+) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
     """
     Calculate the vectors of a camera pointing to a target point.
 
@@ -50,7 +50,7 @@ def camera_vectors_from_target_position(
     # return camera_position, -mat[:3, 2], mat[:3, 1]
 
 
-def unit_vector(v: NDArray[np.float_]) -> NDArray[np.float_]:
+def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]:
     """
     Return the unit vector of a vector.
 

src/bcf/bcf/inmemory_zipfile.py

@@ -5,6 +5,7 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 
 original idea from https://stackoverflow.com/a/19722365/1307905
 """
+
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -13,8 +14,7 @@ from typing import Any, Optional, Protocol
 
 
 class ZipFileInterface(Protocol):
-    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None:
-        ...
+    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None: ...
 
 
 class InMemoryZipFile:

src/bcf/bcf/v2/bcfxml.py

@@ -1,4 +1,5 @@
 """BCF XML V2 handler."""
+
 import uuid
 import warnings
 import zipfile

src/bcf/bcf/v2/model/markup.py

@@ -34,7 +34,7 @@ class BimSnippet:
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -64,7 +64,7 @@ class HeaderFile:
             "name": "Filename",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     date: Optional[XmlDateTime] = field(
         default=None,
@@ -72,7 +72,7 @@ class HeaderFile:
             "name": "Date",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     reference: Optional[str] = field(
         default=None,
@@ -80,7 +80,7 @@ class HeaderFile:
             "name": "Reference",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     ifc_project: Optional[str] = field(
         default=None,
@@ -89,7 +89,7 @@ class HeaderFile:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        }
+        },
     )
     ifc_spatial_structure_element: Optional[str] = field(
         default=None,
@@ -98,14 +98,14 @@ class HeaderFile:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        }
+        },
     )
     is_external: bool = field(
         default=True,
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -120,7 +120,7 @@ class TopicDocumentReference:
             "name": "ReferencedDocument",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     description: Optional[str] = field(
         default=None,
@@ -128,7 +128,7 @@ class TopicDocumentReference:
             "name": "Description",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: Optional[str] = field(
         default=None,
@@ -136,14 +136,14 @@ class TopicDocumentReference:
             "name": "Guid",
             "type": "Attribute",
             "pattern": r"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}",
-        }
+        },
     )
     is_external: bool = field(
         default=False,
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -170,7 +170,7 @@ class ViewPoint:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     snapshot: Optional[str] = field(
         default=None,
@@ -178,7 +178,7 @@ class ViewPoint:
             "name": "Snapshot",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     index: Optional[int] = field(
         default=None,
@@ -186,7 +186,7 @@ class ViewPoint:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -230,7 +230,7 @@ class Comment:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_date: Optional[XmlDateTime] = field(
         default=None,
@@ -238,7 +238,7 @@ class Comment:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -246,7 +246,7 @@ class Comment:
             "name": "ModifiedAuthor",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -267,7 +267,7 @@ class Header:
             "type": "Element",
             "namespace": "",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -279,7 +279,7 @@ class Topic:
             "name": "ReferenceLink",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     title: str = field(
         metadata={
@@ -295,7 +295,7 @@ class Topic:
             "name": "Priority",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     index: Optional[int] = field(
         default=None,
@@ -303,7 +303,7 @@ class Topic:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     labels: List[str] = field(
         default_factory=list,
@@ -311,7 +311,7 @@ class Topic:
             "name": "Labels",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     creation_date: XmlDateTime = field(
         metadata={
@@ -335,7 +335,7 @@ class Topic:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -343,7 +343,7 @@ class Topic:
             "name": "ModifiedAuthor",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     due_date: Optional[XmlDateTime] = field(
         default=None,
@@ -351,7 +351,7 @@ class Topic:
             "name": "DueDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     assigned_to: Optional[str] = field(
         default=None,
@@ -359,7 +359,7 @@ class Topic:
             "name": "AssignedTo",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     stage: Optional[str] = field(
         default=None,
@@ -367,7 +367,7 @@ class Topic:
             "name": "Stage",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     description: Optional[str] = field(
         default=None,
@@ -375,7 +375,7 @@ class Topic:
             "name": "Description",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     bim_snippet: Optional[BimSnippet] = field(
         default=None,
@@ -383,7 +383,7 @@ class Topic:
             "name": "BimSnippet",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     document_reference: List[TopicDocumentReference] = field(
         default_factory=list,
@@ -391,7 +391,7 @@ class Topic:
             "name": "DocumentReference",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     related_topic: List[TopicRelatedTopic] = field(
         default_factory=list,
@@ -399,7 +399,7 @@ class Topic:
             "name": "RelatedTopic",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -414,14 +414,14 @@ class Topic:
         metadata={
             "name": "TopicType",
             "type": "Attribute",
-        }
+        },
     )
     topic_status: Optional[str] = field(
         default=None,
         metadata={
             "name": "TopicStatus",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -433,7 +433,7 @@ class Markup:
             "name": "Header",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     topic: Topic = field(
         metadata={
@@ -449,7 +449,7 @@ class Markup:
             "name": "Comment",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     viewpoints: List[ViewPoint] = field(
         default_factory=list,
@@ -457,5 +457,5 @@ class Markup:
             "name": "Viewpoints",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )

src/bcf/bcf/v2/model/project.py

@@ -10,7 +10,7 @@ class Project:
             "name": "Name",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     project_id: str = field(
         metadata={
@@ -29,7 +29,7 @@ class ProjectExtension:
             "name": "Project",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     extension_schema: str = field(
         metadata={

src/bcf/bcf/v2/model/version.py

@@ -10,12 +10,12 @@ class Version:
             "name": "DetailedVersion",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     version_id: Optional[str] = field(
         default=None,
         metadata={
             "name": "VersionId",
             "type": "Attribute",
-        }
+        },
     )

src/bcf/bcf/v2/model/visinfo.py

@@ -15,14 +15,14 @@ class Component:
         metadata={
             "name": "OriginatingSystem",
             "type": "Element",
-        }
+        },
     )
     authoring_tool_id: Optional[str] = field(
         default=None,
         metadata={
             "name": "AuthoringToolId",
             "type": "Element",
-        }
+        },
     )
     ifc_guid: Optional[str] = field(
         default=None,
@@ -31,7 +31,7 @@ class Component:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        }
+        },
     )
 
 
@@ -92,21 +92,21 @@ class ViewSetupHints:
         metadata={
             "name": "SpacesVisible",
             "type": "Attribute",
-        }
+        },
     )
     space_boundaries_visible: Optional[bool] = field(
         default=None,
         metadata={
             "name": "SpaceBoundariesVisible",
             "type": "Attribute",
-        }
+        },
     )
     openings_visible: Optional[bool] = field(
         default=None,
         metadata={
             "name": "OpeningsVisible",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -139,7 +139,7 @@ class ComponentColoringColor:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
     color: Optional[str] = field(
         default=None,
@@ -147,7 +147,7 @@ class ComponentColoringColor:
             "name": "Color",
             "type": "Attribute",
             "pattern": r"[0-9,a-f,A-F]{6}([0-9,a-f,A-F]{2})?",
-        }
+        },
     )
 
 
@@ -159,7 +159,7 @@ class ComponentSelection:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -174,7 +174,7 @@ class ComponentVisibilityExceptions:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -205,6 +205,7 @@ class OrthogonalCamera:
         camera_up_vector:
         view_to_world_scale: view's visible size in meters
     """
+
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -247,6 +248,7 @@ class PerspectiveCamera:
             release and viewers should be expect values outside this
             range in current implementations.
     """
+
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -336,7 +338,7 @@ class ComponentColoring:
             "name": "Color",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -347,14 +349,14 @@ class ComponentVisibility:
         metadata={
             "name": "Exceptions",
             "type": "Element",
-        }
+        },
     )
     default_visibility: Optional[bool] = field(
         default=None,
         metadata={
             "name": "DefaultVisibility",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -368,7 +370,7 @@ class VisualizationInfoClippingPlanes:
         metadata={
             "name": "ClippingPlane",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -383,7 +385,7 @@ class VisualizationInfoLines:
             "name": "Line",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -394,14 +396,14 @@ class Components:
         metadata={
             "name": "ViewSetupHints",
             "type": "Element",
-        }
+        },
     )
     selection: Optional[ComponentSelection] = field(
         default=None,
         metadata={
             "name": "Selection",
             "type": "Element",
-        }
+        },
     )
     visibility: ComponentVisibility = field(
         metadata={
@@ -415,7 +417,7 @@ class Components:
         metadata={
             "name": "Coloring",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -424,47 +426,48 @@ class VisualizationInfo:
     """
     VisualizationInfo documentation.
     """
+
     components: Optional[Components] = field(
         default=None,
         metadata={
             "name": "Components",
             "type": "Element",
-        }
+        },
     )
     orthogonal_camera: Optional[OrthogonalCamera] = field(
         default=None,
         metadata={
             "name": "OrthogonalCamera",
             "type": "Element",
-        }
+        },
     )
     perspective_camera: Optional[PerspectiveCamera] = field(
         default=None,
         metadata={
             "name": "PerspectiveCamera",
             "type": "Element",
-        }
+        },
     )
     lines: Optional[VisualizationInfoLines] = field(
         default=None,
         metadata={
             "name": "Lines",
             "type": "Element",
-        }
+        },
     )
     clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
         default=None,
         metadata={
             "name": "ClippingPlanes",
             "type": "Element",
-        }
+        },
     )
     bitmap: List[VisualizationInfoBitmap] = field(
         default_factory=list,
         metadata={
             "name": "Bitmap",
             "type": "Element",
-        }
+        },
     )
     guid: str = field(
         metadata={

src/bcf/bcf/v2/topic.py

@@ -1,4 +1,5 @@
 """BCF XML V2 Topic handler."""
+
 import datetime
 import tempfile
 import uuid
@@ -277,7 +278,7 @@ class TopicHandler:
         self.add_visinfo_handler(new_viewpoint)
         return new_viewpoint
 
-    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None:
         """Add a viewpoint pointing at an XYZ point in space
 
         Args:

src/bcf/bcf/v2/visinfo.py

@@ -176,7 +176,7 @@ class VisualizationInfoHandler:
     @classmethod
     def create_from_point_and_guids(
         cls,
-        position: NDArray[np.float_],
+        position: NDArray[np.float64],
         *guids: str,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> "VisualizationInfoHandler":
@@ -224,7 +224,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
@@ -261,7 +261,7 @@ def build_components(*guids: str) -> mdl.Components:
     )
 
 
-def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.
 
@@ -275,7 +275,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
+    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.

src/bcf/bcf/v3/bcfxml.py

@@ -1,4 +1,5 @@
 """BCF XML V3 handlers."""
+
 import uuid
 import warnings
 import zipfile

src/bcf/bcf/v3/document.py

@@ -1,4 +1,5 @@
 """BCF XML V3 Documents handler."""
+
 import zipfile
 from typing import Any, Optional
 

src/bcf/bcf/v3/model/documents.py

@@ -22,7 +22,7 @@ class Document:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -45,7 +45,7 @@ class DocumentInfoDocuments:
             "name": "Document",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -57,5 +57,5 @@ class DocumentInfo:
             "name": "Documents",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )

src/bcf/bcf/v3/model/extensions.py

@@ -15,7 +15,7 @@ class ExtensionsPriorities:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -32,7 +32,7 @@ class ExtensionsSnippetTypes:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -49,7 +49,7 @@ class ExtensionsStages:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -66,7 +66,7 @@ class ExtensionsTopicLabels:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -83,7 +83,7 @@ class ExtensionsTopicStatuses:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -100,7 +100,7 @@ class ExtensionsTopicTypes:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -117,7 +117,7 @@ class ExtensionsUsers:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -129,7 +129,7 @@ class Extensions:
             "name": "TopicTypes",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     topic_statuses: Optional[ExtensionsTopicStatuses] = field(
         default=None,
@@ -137,7 +137,7 @@ class Extensions:
             "name": "TopicStatuses",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     priorities: Optional[ExtensionsPriorities] = field(
         default=None,
@@ -145,7 +145,7 @@ class Extensions:
             "name": "Priorities",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     topic_labels: Optional[ExtensionsTopicLabels] = field(
         default=None,
@@ -153,7 +153,7 @@ class Extensions:
             "name": "TopicLabels",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     users: Optional[ExtensionsUsers] = field(
         default=None,
@@ -161,7 +161,7 @@ class Extensions:
             "name": "Users",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     snippet_types: Optional[ExtensionsSnippetTypes] = field(
         default=None,
@@ -169,7 +169,7 @@ class Extensions:
             "name": "SnippetTypes",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     stages: Optional[ExtensionsStages] = field(
         default=None,
@@ -177,5 +177,5 @@ class Extensions:
             "name": "Stages",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )

src/bcf/bcf/v3/model/markup.py

@@ -40,7 +40,7 @@ class BimSnippet:
         metadata={
             "name": "IsExternal",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -68,7 +68,7 @@ class DocumentReference:
             "type": "Element",
             "namespace": "",
             "pattern": r"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}",
-        }
+        },
     )
     url: Optional[str] = field(
         default=None,
@@ -78,7 +78,7 @@ class DocumentReference:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     description: Optional[str] = field(
         default=None,
@@ -88,7 +88,7 @@ class DocumentReference:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -110,7 +110,7 @@ class File:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     date: Optional[XmlDateTime] = field(
         default=None,
@@ -118,7 +118,7 @@ class File:
             "name": "Date",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     reference: Optional[str] = field(
         default=None,
@@ -128,7 +128,7 @@ class File:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     ifc_project: Optional[str] = field(
         default=None,
@@ -137,7 +137,7 @@ class File:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        }
+        },
     )
     ifc_spatial_structure_element: Optional[str] = field(
         default=None,
@@ -146,14 +146,14 @@ class File:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        }
+        },
     )
     is_external: bool = field(
         default=True,
         metadata={
             "name": "IsExternal",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -170,7 +170,7 @@ class TopicLabels:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -187,7 +187,7 @@ class TopicReferenceLinks:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
 
 
@@ -216,7 +216,7 @@ class ViewPoint:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     snapshot: Optional[str] = field(
         default=None,
@@ -226,7 +226,7 @@ class ViewPoint:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     index: Optional[int] = field(
         default=None,
@@ -234,7 +234,7 @@ class ViewPoint:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -274,7 +274,7 @@ class Comment:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     viewpoint: Optional[CommentViewpoint] = field(
         default=None,
@@ -282,7 +282,7 @@ class Comment:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_date: Optional[XmlDateTime] = field(
         default=None,
@@ -290,7 +290,7 @@ class Comment:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -300,7 +300,7 @@ class Comment:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -323,7 +323,7 @@ class HeaderFiles:
             "name": "File",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -338,7 +338,7 @@ class TopicDocumentReferences:
             "name": "DocumentReference",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -353,7 +353,7 @@ class TopicRelatedTopics:
             "name": "RelatedTopic",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -368,7 +368,7 @@ class TopicViewpoints:
             "name": "ViewPoint",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -380,7 +380,7 @@ class Header:
             "name": "Files",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -395,7 +395,7 @@ class TopicComments:
             "name": "Comment",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
 
 
@@ -407,7 +407,7 @@ class Topic:
             "name": "ReferenceLinks",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     title: str = field(
         metadata={
@@ -427,7 +427,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     index: Optional[int] = field(
         default=None,
@@ -435,7 +435,7 @@ class Topic:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     labels: Optional[TopicLabels] = field(
         default=None,
@@ -443,7 +443,7 @@ class Topic:
             "name": "Labels",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     creation_date: XmlDateTime = field(
         metadata={
@@ -469,7 +469,7 @@ class Topic:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -479,7 +479,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     due_date: Optional[XmlDateTime] = field(
         default=None,
@@ -487,7 +487,7 @@ class Topic:
             "name": "DueDate",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     assigned_to: Optional[str] = field(
         default=None,
@@ -497,7 +497,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     stage: Optional[str] = field(
         default=None,
@@ -507,7 +507,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     description: Optional[str] = field(
         default=None,
@@ -517,7 +517,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     bim_snippet: Optional[BimSnippet] = field(
         default=None,
@@ -525,7 +525,7 @@ class Topic:
             "name": "BimSnippet",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     document_references: Optional[TopicDocumentReferences] = field(
         default=None,
@@ -533,7 +533,7 @@ class Topic:
             "name": "DocumentReferences",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     related_topics: Optional[TopicRelatedTopics] = field(
         default=None,
@@ -541,7 +541,7 @@ class Topic:
             "name": "RelatedTopics",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     comments: Optional[TopicComments] = field(
         default=None,
@@ -549,7 +549,7 @@ class Topic:
             "name": "Comments",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     viewpoints: Optional[TopicViewpoints] = field(
         default=None,
@@ -557,7 +557,7 @@ class Topic:
             "name": "Viewpoints",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     guid: str = field(
         metadata={
@@ -574,7 +574,7 @@ class Topic:
             "type": "Attribute",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     topic_type: str = field(
         metadata={
@@ -604,7 +604,7 @@ class Markup:
             "name": "Header",
             "type": "Element",
             "namespace": "",
-        }
+        },
     )
     topic: Topic = field(
         metadata={

src/bcf/bcf/v3/model/project.py

@@ -12,7 +12,7 @@ class Project:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     project_id: str = field(
         metadata={

src/bcf/bcf/v3/model/visinfo.py

@@ -17,7 +17,7 @@ class Component:
             "type": "Element",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     authoring_tool_id: Optional[str] = field(
         default=None,
@@ -26,7 +26,7 @@ class Component:
             "type": "Element",
             "min_length": 1,
             "white_space": "collapse",
-        }
+        },
     )
     ifc_guid: Optional[str] = field(
         default=None,
@@ -35,7 +35,7 @@ class Component:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        }
+        },
     )
 
 
@@ -96,21 +96,21 @@ class ViewSetupHints:
         metadata={
             "name": "SpacesVisible",
             "type": "Attribute",
-        }
+        },
     )
     space_boundaries_visible: bool = field(
         default=False,
         metadata={
             "name": "SpaceBoundariesVisible",
             "type": "Attribute",
-        }
+        },
     )
     openings_visible: bool = field(
         default=False,
         metadata={
             "name": "OpeningsVisible",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -191,7 +191,7 @@ class ComponentColoringColorComponents:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        }
+        },
     )
 
 
@@ -202,7 +202,7 @@ class ComponentSelection:
         metadata={
             "name": "Component",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -216,7 +216,7 @@ class ComponentVisibilityExceptions:
         metadata={
             "name": "Component",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -249,6 +249,7 @@ class OrthogonalCamera:
         aspect_ratio: Proportional relationship between the width and
             the height of the view (w/h).
     """
+
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -302,6 +303,7 @@ class PerspectiveCamera:
         aspect_ratio: Proportional relationship between the width and
             the height of the view (w/h).
     """
+
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -371,21 +373,21 @@ class ComponentVisibility:
         metadata={
             "name": "ViewSetupHints",
             "type": "Element",
-        }
+        },
     )
     exceptions: Optional[ComponentVisibilityExceptions] = field(
         default=None,
         metadata={
             "name": "Exceptions",
             "type": "Element",
-        }
+        },
     )
     default_visibility: bool = field(
         default=False,
         metadata={
             "name": "DefaultVisibility",
             "type": "Attribute",
-        }
+        },
     )
 
 
@@ -399,7 +401,7 @@ class VisualizationInfoBitmaps:
         metadata={
             "name": "Bitmap",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -413,7 +415,7 @@ class VisualizationInfoClippingPlanes:
         metadata={
             "name": "ClippingPlane",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -427,7 +429,7 @@ class VisualizationInfoLines:
         metadata={
             "name": "Line",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -438,7 +440,7 @@ class ComponentColoring:
         metadata={
             "name": "Color",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -449,21 +451,21 @@ class Components:
         metadata={
             "name": "Selection",
             "type": "Element",
-        }
+        },
     )
     visibility: Optional[ComponentVisibility] = field(
         default=None,
         metadata={
             "name": "Visibility",
             "type": "Element",
-        }
+        },
     )
     coloring: Optional[ComponentColoring] = field(
         default=None,
         metadata={
             "name": "Coloring",
             "type": "Element",
-        }
+        },
     )
 
 
@@ -472,47 +474,48 @@ class VisualizationInfo:
     """
     VisualizationInfo documentation.
     """
+
     components: Optional[Components] = field(
         default=None,
         metadata={
             "name": "Components",
             "type": "Element",
-        }
+        },
     )
     orthogonal_camera: Optional[OrthogonalCamera] = field(
         default=None,
         metadata={
             "name": "OrthogonalCamera",
             "type": "Element",
-        }
+        },
     )
     perspective_camera: Optional[PerspectiveCamera] = field(
         default=None,
         metadata={
             "name": "PerspectiveCamera",
             "type": "Element",
-        }
+        },
     )
     lines: Optional[VisualizationInfoLines] = field(
         default=None,
         metadata={
             "name": "Lines",
             "type": "Element",
-        }
+        },
     )
     clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
         default=None,
         metadata={
             "name": "ClippingPlanes",
             "type": "Element",
-        }
+        },
     )
     bitmaps: Optional[VisualizationInfoBitmaps] = field(
         default=None,
         metadata={
             "name": "Bitmaps",
             "type": "Element",
-        }
+        },
     )
     guid: str = field(
         metadata={

src/bcf/bcf/v3/topic.py

@@ -1,4 +1,5 @@
 """BCF XML V3 Topic handler."""
+
 import datetime
 import uuid
 import zipfile
@@ -174,7 +175,7 @@ class TopicHandler:
         new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
         self.add_visinfo_handler(new_viewpoint)
 
-    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None:
         """
         Add a viewpoint tergeting an IFC element to the topic.
 

src/bcf/bcf/v3/visinfo.py

@@ -175,7 +175,7 @@ class VisualizationInfoHandler:
     @classmethod
     def create_from_point_and_guids(
         cls,
-        position: NDArray[np.float_],
+        position: NDArray[np.float64],
         *guids: str,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> "VisualizationInfoHandler":
@@ -218,7 +218,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
@@ -255,7 +255,7 @@ def build_components(*guids: str) -> mdl.Components:
     )
 
 
-def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.
 
@@ -269,7 +269,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
+    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.

src/bcf/bcf/xml_parser.py

@@ -1,4 +1,5 @@
 """XML Parser and Serializer factories."""
+
 from typing import Optional, Protocol, Type, TypeVar
 
 from xsdata.formats.dataclass.context import XmlContext

src/bcf/tests/v2/test_bcf_xml.py

@@ -1,4 +1,5 @@
 """BCF XML tests."""
+
 import uuid
 from pathlib import Path
 from tempfile import TemporaryDirectory

src/bcf/tests/v3/test_bcf_xml.py

@@ -1,4 +1,5 @@
 """BCF XML tests."""
+
 import uuid
 from pathlib import Path
 from tempfile import TemporaryDirectory

src/blenderbim/Makefile

@@ -20,8 +20,12 @@ PYTHON:=python3.11
 PIP:=pip3.11
 PATCH:=patch
 SED:=sed -i
+VENV_ACTIVATE:=bin/activate
+
 ifeq ($(OS),Windows_NT)
 HOSTOS:=win
+PYTHON:=python
+VENV_ACTIVATE:=Scripts/activate
 else
 UNAME_S:=$(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -45,11 +49,6 @@ LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
 PYVERSION:=py310
 PYPI_IMP:=cp
 
-ifeq ($(PYVERSION), py39)
-PYLIBDIR:=python3.9
-PYNUMBER:=39
-PYPI_VERSION:=3.9
-endif
 ifeq ($(PYVERSION), py310)
 PYLIBDIR:=python3.10
 PYNUMBER:=310
@@ -87,182 +86,275 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=c18e4ea
+OLD:=d51fa2c
 .PHONY: bump
 bump:
 	cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
 	cd ../ifcopenshell-python/ && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
-	cd ../ifcopenshell-python/docs/ifcconvert/ && $(SED) -b "s/$(OLD)/$(NEW)/" installation.rst
 
 .PHONY: dist
 dist:
 ifndef PLATFORM
 	$(error PLATFORM is not set)
 endif
-	rm -rf dist
-	mkdir -p dist/working
-	mkdir -p dist/blenderbim
-	cp -r blenderbim/* dist/blenderbim/
+	rm -rf build
+	mkdir -p build
+	mkdir -p dist
+	cp -r blenderbim build/
 
 	# To scope any build-time dependencies
-	cd dist/working && $(PYTHON) -m venv env
-	cd dist/working && . env/bin/activate && $(PIP) install wheel
+	cd build && $(PYTHON) -m venv env && . env/$(VENV_ACTIVATE) && $(PIP) install build
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) install wheel
 
+	mkdir -p build/wheels
 	# Provides IfcOpenShell Python functionality
-	cd ../ifcopenshell-python && make dist PLATFORM=$(PLATFORM)64 PYVERSION=$(PYVERSION) && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../bcf && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifcclash && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifcbimtester && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifctester && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifcfm && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../bsdd && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifcdiff && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifccsv && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifcpatch && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifc4d && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifc5d && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd ../ifccityjson && make dist && cp dist/*.whl ../blenderbim/dist/blenderbim/wheels/
-	cd dist/working && . env/bin/activate && $(PIP) download GitPython --dest=../blenderbim/wheels
+	cd ../ifcopenshell-python && make dist PLATFORM=$(PLATFORM)64 PYVERSION=$(PYVERSION) && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../bcf && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcclash && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifctester && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcfm && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../bsdd && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcdiff && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifccsv && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifcpatch && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifc4d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifc5d && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd ../ifccityjson && make dist && mv dist/*.whl ../blenderbim/build/wheels/
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download GitPython --dest=./wheels
 	# Provides audio playback for costing
 	# This is a REALLY IMPORTANT feature
-	cd dist/working && . env/bin/activate && $(PIP) wheel git+https://github.com/Andrej730/aud.git --wheel-dir=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/Andrej730/aud.git --wheel-dir=./wheels
 	# IfcOpenShell dependency - support for new typing features
-	cd dist/working && . env/bin/activate && $(PIP) download typing_extensions --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download typing_extensions --dest=./wheels
 	# Required by IfcCSV
-	cd dist/working && . env/bin/activate && $(PIP) download pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Pandas ships with very heavy tests
-	# cd dist/working/site-packages/pandas && rm -rf tests
-	cd dist/working && . env/bin/activate && $(PIP) download openpyxl --dest=../blenderbim/wheels
+	# cd build/site-packages/pandas && rm -rf tests
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download openpyxl --dest=./wheels
 	# odfpy doesn't come with its own wheel, so whee'l (get it?) create it ourselves!
-	cd dist/working && . env/bin/activate && $(PIP) wheel odfpy --wheel-dir=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel odfpy --wheel-dir=./wheels
 	# Required by IFCCityJSON
-	cd dist/working && . env/bin/activate && $(PIP) download cjio --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --dest=./wheels
 	# Provides express rule validation for ifcopenshell.validate
-	cd dist/working && . env/bin/activate && $(PIP) download pytest --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytest --dest=./wheels
 	# Provides Brickschema functionality
-	cd dist/working && . env/bin/activate && $(PIP) download "brickschema[persistence]==0.7.6a2" --dest=../blenderbim/wheels
+	# Is not platform specific but has platform specific dependencies.
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "brickschema[persistence]==0.7.6a2" $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Required for SVG to DXF conversion
-	cd dist/working && . env/bin/activate && $(PIP) download ezdxf --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download ezdxf $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Required by bcf
-	cd dist/working && . env/bin/activate && $(PIP) download xsdata --dest=../blenderbim/wheels
-	cd dist/working && . env/bin/activate && $(PIP) download xmlschema --dest=../blenderbim/wheels
-	cd dist/working && . env/bin/activate && $(PIP) download elementpath --dest=../blenderbim/wheels
-	cd dist/working && . env/bin/activate && $(PIP) download six --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download xsdata --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download xmlschema --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download elementpath --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download six --dest=./wheels
 	# Required by drawing module
-	cd dist/working && . env/bin/activate && $(PIP) download lxml $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lxml $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Required by qto and drawing module
-	cd dist/working && . env/bin/activate && $(PIP) download shapely $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download shapely $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Required by the BIM type manager thumbnail generator
-	cd dist/working && . env/bin/activate && $(PIP) download pillow $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pillow $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Provides mustache templating in construction docs and web UI data
-	cd dist/working && . env/bin/activate && $(PIP) download pystache --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pystache --dest=./wheels
 	# Provides SVG export in construction documentation
-	cd dist/working && . env/bin/activate && $(PIP) download svgwrite --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download svgwrite --dest=./wheels
 	# Provides fuzzy date parsing for construction sequencing
-	cd dist/working && . env/bin/activate && $(PIP) download python-dateutil --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-dateutil --dest=./wheels
 	# Provides duration parsing for construction sequencing
-	cd dist/working && . env/bin/activate && $(PIP) download isodate --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download isodate --dest=./wheels
 	# Provides networkx graph analysis for project dependency calculations
-	cd dist/working && . env/bin/activate && $(PIP) download networkx --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download networkx --dest=./wheels
 	# Required by IFCDiff
-	cd dist/working && . env/bin/activate && $(PIP) download deepdiff --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download deepdiff --dest=./wheels
 	# Required by IFCCSV and ifcopenshell.util.selector
-	cd dist/working && . env/bin/activate && $(PIP) download lark --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lark --dest=./wheels
 	# Required by IFC4D
-	cd dist/working && . env/bin/activate && $(PIP) download PyP6Xer --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download PyP6Xer --dest=./wheels
 	# Required by web module
-	cd dist/working && . env/bin/activate && $(PIP) download python-socketio[asyncio_client] --dest=../blenderbim/wheels
-	cd dist/working && . env/bin/activate && $(PIP) download aiohttp --dest=../blenderbim/wheels
+	# Is not platform specific but has platform specific dependencies.
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-socketio[asyncio_client] $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download aiohttp $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# Required by light module
-	cd dist/working && . env/bin/activate && $(PIP) download pytz --dest=../blenderbim/wheels
-	cd dist/working && . env/bin/activate && $(PIP) download tzfpy $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytz --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tzfpy $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	# pyradiance is using different platform versions than defaults in our makefile.
 ifeq ($(PLATFORM), linux)
-	cd dist/working && . env/bin/activate && $(PIP) download pyradiance --platform manylinux_2_35_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform manylinux_2_35_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 else ifeq ($(PLATFORM), macos)
-	cd dist/working && . env/bin/activate && $(PIP) download pyradiance --platform macosx_10_13_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform macosx_10_13_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 else
-	cd dist/working && . env/bin/activate && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=../blenderbim/wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
+endif
+	# tomllib replacement for < Python 3.11, used to parse blender_manifest
+ifeq ($(PYVERSION), py310)
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tomli --dest=./wheels
 endif
-	rm -rf dist/working
 
 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
-	mkdir dist/working
-	cd dist/working && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
-	cd dist/working && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
-	cp dist/working/jsgantt* dist/blenderbim/bim/data/gantt/
-	rm -rf dist/working
+	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
+	cd build/blenderbim/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
 
 	# Provides IFCJSON functionality
-	mkdir dist/working
-	cd dist/working && wget https://github.com/IFCJSON-Team/IFC2JSON_python/archive/master.zip
-	cd dist/working && unzip 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 dist/working/IFC2JSON_python-master/file_converters && \
+	cd build && . env/$(VENV_ACTIVATE) && cd IFC2JSON_python-*/file_converters && \
 		$(PYTHON) -c "from setuptools import setup; \
 		setup( \
 			name='ifcjson', \
-			version='0.0.0', \
+			version='0.0.1', \
 			author='Jan Brouwer', \
 			author_email='jan@brewsky.nl', \
 			packages=['ifcjson'], \
 		)" bdist_wheel
-	cp -r dist/working/IFC2JSON_python-master/file_converters/dist/*.whl dist/blenderbim/wheels/
-	rm -rf dist/working
+	cp -r build/IFC2JSON_python-*/file_converters/dist/*.whl build/wheels/
 
 	# Brickschema requires pkg_resources which is provided by Blender.
 	# Provides Brickschema functionality
-	mkdir dist/working
 	# For now lets bundle the latest nightly schema
-	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
-	cd dist/working && cp Brick.ttl ../blenderbim/bim/schema/Brick.ttl
-	rm -rf dist/working
+	cd build/blenderbim/bim/schema && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
 
 	# Required for hipped roof generation
-	mkdir dist/working
-	cd dist/working && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
-	cd dist/working && unzip master.zip
-	cd dist/working/bpypolyskel-master && \
+	cd build && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
+	cd build && unzip master.zip && rm master.zip
+	cd build && . env/$(VENV_ACTIVATE) && cd bpypolyskel-master && \
 		$(PYTHON) -c "from setuptools import setup; \
 		setup( \
 			name='bpypolyskel', \
 			version='0.0.0', \
 			packages=['bpypolyskel'], \
 		)" bdist_wheel
-	cp -r dist/working/bpypolyskel-master/dist/*.whl dist/blenderbim/wheels/
-	rm -rf dist/working
+	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/
 
 	# Required for Desktop icon and file association
-	cp -r blenderbim/libs/desktop dist/blenderbim/libs/
+	cp -r blenderbim/libs/desktop build/blenderbim/libs/
 
 	# Generate translations module for BBIM build
-	git clone https://github.com/IfcOpenShell/blenderbim-translations.git dist/working
-	$(PYTHON) scripts/bbim_translations.py -i "dist/working" -o "dist/blenderbim"
-	rm -rf dist/working
+	git clone https://github.com/IfcOpenShell/blenderbim-translations.git build/working
+	$(PYTHON) scripts/bbim_translations.py -i "build/working" -o "build/blenderbim"
+	rm -rf build/working
 
 	# Remove dependencies also bundled with Blender
-	rm -rf dist/blenderbim/wheels/numpy*
+	rm -rf build/wheels/numpy*
+
+	cp pyproject.toml build/
+ifeq ($(IS_STABLE), TRUE)
+	$(SED) "s/0.0.0/$(VERSION)/" build/blenderbim/blender_manifest.toml
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
+else
+	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/blenderbim/blender_manifest.toml
+	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/blenderbim/__init__.py
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
+endif
+
+	$(SED) "s/os-arch/$(BLENDER_PLATFORM)/" build/blenderbim/blender_manifest.toml
+
+	# Provides BlenderBIM Add-on functionality
+ifeq ($(IS_STABLE), TRUE)
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' build/pyproject.toml
+else
+	$(SED) 's/version = "0.0.0"/version = "$(VERSION)a$(VERSION_DATE)"/' build/pyproject.toml
+endif
+	cd build && . env/$(VENV_ACTIVATE) && $(PYTHON) -m build
+	cp build/dist/*.whl build/wheels/
+
+	# Safeguard for non-wheel dependencies slipping in.
+	wheels=$$(find build/wheels/* ! -name "*.whl"); \
+	if [ -n "$$wheels" ]; then \
+		echo "Found non-wheel dependencies:"; \
+		echo "$$wheels"; \
+		echo "Error: non-wheel dependencies are not supported by Blender!"; \
+		exit 1; \
+	fi
+	mv build/wheels/*.whl build/blenderbim/wheels/
+
+	# Ugly patch to accomodate MacOS universal builds not being recognized by Blender.
+	# Blender doesn't look into the wheel contents, it just checks the name.
+	# So this hack works without working out some way to repack those wheels.
+	# See: https://projects.blender.org/blender/blender/issues/125091
+
+ifeq ($(PLATFORM), macosm1)
+	# Has universal and x86_64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/MarkupSafe-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has universal and x86_64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/lxml-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# Has only universal build.
+	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+endif
+ifeq ($(PLATFORM), macos)
+	prev_whl_name=$$(find build/blenderbim/wheels/tzfpy-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	prev_whl_name=$$(find build/blenderbim/wheels/greenlet-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+
+	# has universal and amr64 builds.
+	prev_whl_name=$$(find build/blenderbim/wheels/fonttools-*.whl); \
+	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
+	mv "$$prev_whl_name" "$$whl_name";
+endif
+
+	# Safeguard for unhandled universal files.
+	wheels=$$(find build/blenderbim/wheels/*universal2*.whl); \
+	if [ -n "$$wheels" ]; then \
+		echo "Found universal2 wheel files:"; \
+		echo "$$wheels"; \
+		echo "Error: universal2 wheel files are not supported by Blender!"; \
+		exit 1; \
+	fi
+
+ifneq ($(PLATFORM), linux)
+	# Safeguard: in case one of `pip download` will break,
+	# it will produce a linux wheel for non-linux build (our github action machine is using linux).
+	wheels=$$(find build/blenderbim/wheels/*manylinux_*.whl); \
+	if [ -n "$$wheels" ]; then \
+		echo "Found linux wheel files in non-linux build:"; \
+		echo "$$wheels"; \
+		echo "Error: linux wheels are incompatible with build $(PLATFORM)!"; \
+		exit 1; \
+	fi
+endif
+
+	$(PYTHON) scripts/get_wheels.py build/blenderbim/wheels build/blenderbim/blender_manifest.toml
+	rm -rf build/blenderbim/bim/
+	rm -rf build/blenderbim/core/
+	rm -rf build/blenderbim/tool/
 
 ifeq ($(IS_STABLE), TRUE)
-	cd dist/blenderbim && $(SED) "s/0, 0, 0/$(VERSION_MAJOR), $(VERSION_MINOR), $(VERSION_PATCH)/" __init__.py
-	cd dist/blenderbim && $(SED) "s/0.0.0/$(VERSION)/" blender_manifest.toml
-	cd dist && zip -r blenderbim_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./*
+	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./blenderbim
 else
-	cd dist/blenderbim && $(SED) "s/0, 0, 0/$(VERSION_MAJOR), $(VERSION_MINOR), $(VERSION_PATCH), $(VERSION_DATE)/" __init__.py
-	# Blender manifest version must be semver compatible.
-	cd dist/blenderbim && $(SED) "s/0.0.0/$(VERSION)-$(VERSION_DATE)/" blender_manifest.toml
-	cd dist/blenderbim && $(SED) "s/os-arch/$(BLENDER_PLATFORM)/" blender_manifest.toml
-	$(PYTHON) scripts/get_wheels.py dist/blenderbim/wheels dist/blenderbim/blender_manifest.toml
-	cd dist/blenderbim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
-	cd dist && zip -r blenderbim_$(PYVERSION)-$(VERSION)-$(VERSION_DATE)-$(BLENDER_PLATFORM).zip ./*
+	cd build && zip -r blenderbim_$(PYVERSION)-$(VERSION)-alpha$(VERSION_DATE)-$(BLENDER_PLATFORM).zip ./blenderbim
 endif
-	rm -rf dist/blenderbim
+
+	mv build/blenderbim*.zip dist/
+
+	rm -rf build
 
 .PHONY: test
 test:
-	make test-core
-	make test-tool
-	make test-bim
+	@echo "Running all tests..."
+	@ERROR=0; \
+	make test-core || ERROR=1; \
+	make test-tool || ERROR=1; \
+	make test-bim || ERROR=1; \
+	if [ $$ERROR -ne 0 ]; then \
+		echo "One or more tests failed"; \
+		exit 1; \
+	fi
 
 .PHONY: test-core
 test-core:

src/blenderbim/blenderbim/__init__.py

@@ -27,31 +27,18 @@ import sys
 IN_BLENDER = sys.modules.get("bpy", None)
 if IN_BLENDER:
     import bpy
-    import addon_utils
 
 import re
 import platform
 import traceback
 import webbrowser
+import uuid
+import shutil
 from collections import deque
 from pathlib import Path
-from typing import Union, Any
+from typing import Union, Any, Generator
 
 
-# NOTE: bl_info is superseded by blender_manifest.toml
-# if addon is installed as an extension (Blender 4.2+)
-bl_info = {
-    "name": "BlenderBIM",
-    "description": "Transforms Blender into a native Building Information Model authoring platform using IFC.",
-    "author": "IfcOpenShell Contributors",
-    "blender": (3, 1, 0),
-    "version": (0, 0, 0),
-    "location": "File Menu, Scene Properties Tab. See documentation for more.",
-    "doc_url": "https://docs.blenderbim.org/",
-    "tracker_url": "https://github.com/IfcOpenShell/IfcOpenShell/issues",
-    "category": "System",
-}
-
 last_commit_hash = "8888888"
 
 
@@ -64,21 +51,42 @@ def get_last_commit_hash() -> Union[str, None]:
     return last_commit_hash[:7]
 
 
+# Accessed from blenderbim extension:
+bbim_semver: dict[str, Any] = {}
+
+# Accessed from blenderbim dependency:
 last_error = None
 last_actions: deque = deque(maxlen=10)
+FIRST_INSTALLED_BBIM_VERSION: Union[str, None] = None
+REINSTALLED_BBIM_VERSION: Union[str, None] = None
+
+
+def initialize_bbim_semver():
+    """Initialize `bbim_semver` dictionary.
+
+    Blender doesn't seem to store a full extension version (only major-minor-patch)
+    in `addon_utils.modules()->bl_info['version']`,
+    therefore we just parse it from .toml.
+    """
+    if sys.version_info >= (3, 11):
+        import tomllib as toml
+    else:
+        import tomli as toml
+
+    toml_path = Path(__file__).parent / "blender_manifest.toml"
+    with open(toml_path, "rb") as f:
+        manifest = toml.load(f)
+    semver_pattern = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
+    version_str = manifest["version"]
+    re_version = re.match(semver_pattern, version_str)
+    assert re_version
+    global bbim_semver
+    bbim_semver = re_version.groupdict()
+    bbim_semver["version"] = version_str
 
 
 def get_debug_info():
-    version = ".".join(
-        [
-            str(x)
-            for x in [
-                addon.bl_info.get("version", (-1, -1, -1))
-                for addon in addon_utils.modules()
-                if addon.bl_info["name"] == "BlenderBIM"
-            ][0]
-        ]
-    )
+    bbim_version = bbim_semver["version"]
 
     return {
         "os": platform.system(),
@@ -88,7 +96,7 @@ def get_debug_info():
         "machine": platform.machine(),
         "processor": platform.processor(),
         "blender_version": bpy.app.version_string,
-        "blenderbim_version": version,
+        "blenderbim_version": bbim_version,
         "blenderbim_commit_hash": get_last_commit_hash(),
         "last_actions": last_actions,
         "last_error": last_error,
@@ -106,15 +114,81 @@ def format_debug_info(info: dict):
     return text.strip()
 
 
+def get_binaries(path: Path) -> Generator[Path, None, None]:
+    yield from path.glob("**/*.pyd")
+    yield from path.glob("**/*.dll")
+    # pyradiance is using .so files on windows for some reason.
+    yield from path.glob("**/*.so")
+
+
+def safe_link_dlls() -> None:
+    # Blender 4.2+ has a problem on Windows for disabling/enabling/reinstalling extensions
+    # with loaded binary dependencies (on Windows you can't remove a binary if it's loaded by some program).
+    # To avoid this issue we temporary hard link dlls to our temp directory on unregister()
+    # (unregister is executed before Blender will try to uninstall dependencies and the issue will arise).
+    # Then, Blender won't have a problem unlinking unloaded dlls as they are still linked somewhere.
+    # On register() we clean up our temp directory with binaries.
+    #
+    # TODO: If user uninstalls BlenderBIM to never use it again, temporary directory won't be cleared.
+    #
+    # See: https://projects.blender.org/blender/blender/issues/125049
+    import bpy
+
+    ext_path = Path(bpy.utils.user_resource("EXTENSIONS"))
+    local_path = ext_path / ".local"
+
+    # We use random hash subfolder as user may try to enable/disable addon multiple times.
+    random_hash = uuid.uuid4().hex[:8]
+    temp_local = ext_path / ".local_temp" / random_hash
+    temp_local.mkdir(parents=True)
+
+    for filepath in get_binaries(local_path):
+        dest_path = temp_local / filepath.relative_to(local_path)
+        dest_path.parent.mkdir(exist_ok=True, parents=True)
+        os.link(filepath, dest_path)
+
+
+def clean_up_dlls_safe_links() -> None:
+    import bpy
+
+    ext_path = Path(bpy.utils.user_resource("EXTENSIONS"))
+    temp_path = ext_path / ".local_temp"
+    if not temp_path.exists():
+        return
+
+    for filepath in get_binaries(temp_path):
+        try:
+            os.unlink(filepath)
+        except PermissionError:
+            pass
+
+    def is_empty_directory(directory: Path) -> bool:
+        return not any(directory.iterdir())
+
+    def remove_empty_folders(folder: Path) -> None:
+        for subfolder in folder.iterdir():
+            if subfolder.is_dir():
+                remove_empty_folders(subfolder)
+
+        if is_empty_directory(folder):
+            folder.rmdir()
+
+    remove_empty_folders(temp_path)
+
+
 if IN_BLENDER:
-    # Process *.pth in /libs/site/packages to setup globally importable modules
-    # This is 3 levels deep as required by the static RPATH of ../../ from dependencies taken from Anaconda
-    # site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
-    site_path = Path(__file__).parent.resolve() / "libs" / "site" / "packages"
-    sys.path.insert(0, str(site_path))
+    initialize_bbim_semver()
 
     def get_binary_info() -> dict[str, Any]:
         info = {}
+        py_version = sys.version_info
+        site_path = (
+            Path(bpy.utils.user_resource("EXTENSIONS"))
+            / ".local"
+            / "lib"
+            / f"python{py_version.major}.{py_version.minor}"
+            / "site-packages"
+        )
         lib = site_path / "ifcopenshell"
         binary = next((i for i in lib.glob("_ifcopenshell_wrapper.*")), None)
         if binary is None:
@@ -143,8 +217,7 @@ if IN_BLENDER:
 
         # We can't just use __file__ as blenderbim/__init__.py is typically not symlinked
         # as Blender have errors symlinking main addon package file.
-        path = Path(__file__).parent / "bim" / "__init__.py"
-        path = path.resolve().parent
+        path = Path(__file__).resolve().parent
         repo = git.Repo(str(path), search_parent_directories=True)
         last_commit_hash = repo.head.object.hexsha
     except:
@@ -165,24 +238,43 @@ if IN_BLENDER:
         ifcopenshell.api.add_pre_listener("*", "action_logger", log_api)
 
         def register():
-            global BLENDER_PACKAGE_NAME, __name__, __package__
-            BLENDER_PACKAGE_NAME = __name__
-            if bpy.app.version >= (4, 2, 0):
-                sys.modules["blenderbim"] = sys.modules[__name__]
-                __name__ = "blenderbim"
-                # Only renaming __name__ is actually required to make imports work.
-                # We renaming __package__ just for consistency.
-                __package__ = "blenderbim"
+            if platform.system() == "Windows":
+                clean_up_dlls_safe_links()
+
             import blenderbim.bim
 
+            current_version = bbim_semver["version"]
+            if blenderbim.FIRST_INSTALLED_BBIM_VERSION is None:
+                blenderbim.FIRST_INSTALLED_BBIM_VERSION = current_version
+            elif not blenderbim.REINSTALLED_BBIM_VERSION and blenderbim.FIRST_INSTALLED_BBIM_VERSION != current_version:
+                blenderbim.REINSTALLED_BBIM_VERSION = current_version
+
             blenderbim.bim.register()
 
         def unregister():
+            if platform.system() == "Windows":
+                safe_link_dlls()
+
             import blenderbim.bim
 
             blenderbim.bim.unregister()
 
     except:
+
+        def show_scene_properties() -> None:
+            # By default in Blender object properties are selected.
+            # Or user may have some other properties selected in their startup file.
+            # Select scene properties to ensure user will see our error handler.
+            for area in bpy.context.screen.areas:
+                if area.type != "PROPERTIES":
+                    continue
+                space = area.spaces.active
+                assert isinstance(space, bpy.types.SpaceProperties)
+                space.context = "SCENE"
+
+        # Use a timer as we're not allowed to make changes to data during register().
+        bpy.app.timers.register(show_scene_properties, first_interval=0.1)
+
         last_error = traceback.format_exc()
 
         print(last_error)
@@ -219,9 +311,18 @@ if IN_BLENDER:
                 binary_py = get_binary_info().get("binary_python_version")
                 if binary_py and py != binary_py:
                     box.separator()
+                    # From wrong-platform-build issues we're guarded by Blender extension installation.
+                    # But Blender currently doesn't support separate builds for different Python version,
+                    # so those issues might still slip in.
                     box.label(text="BlenderBIM installed for wrong Python version.")
                     box.label(text=f"Expected: {py}. Got: {binary_py}.")
+                    # On reinstallation, dependencies versions doesn't change, so Blender will just ignore new dependencies.
+                    # So, we need to make user will disable an extension (just uninstallation won't remove dependencies).
+                    # Blender restart doesn't seem to be required in that case
+                    # as dependencies failed to load due to Python version mismatch.
                     box.label(text="Try reinstalling with the correct Python version.")
+                    box.label(text="Before reinstallation make sure to")
+                    box.label(text="DISABLE BlenderBIM (uninstallation won't help).")
                     box.label(text="You can download correct version below.")
 
                 layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
@@ -233,15 +334,15 @@ if IN_BLENDER:
                 bbim_version = info["blenderbim_version"]
                 py_tag = py.replace(".", "")
                 if "Linux" in info["os"]:
-                    os = "linux"
+                    os = "linux-x64"
                 elif "Darwin" in info["os"]:
                     if "arm64" in info["machine"]:
-                        os = "macosm1"
+                        os = "macos-arm64"
                     else:
-                        os = "macos"
+                        os = "macos-x64"
                 else:
-                    os = "win"
-                op.uri = f"https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-{bbim_version}/blenderbim-{bbim_version}-py{py_tag}-{os}.zip"
+                    os = "windows-x64"
+                op.uri = f"https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-{bbim_version}/blenderbim_py{py_tag}-{bbim_version}-{os}.zip"
 
         class OpenUri(bpy.types.Operator):
             bl_idname = "bim.open_uri"

src/blenderbim/blenderbim/bim/__init__.py

@@ -25,7 +25,7 @@ from . import handler, ui, prop, operator, helper
 from typing import Callable, Union
 
 try:
-    from .translations import translations_dict
+    from blenderbim.translations import translations_dict
 except ImportError:
     translations_dict = {}
 cwd = os.path.dirname(os.path.realpath(__file__))
@@ -91,18 +91,19 @@ modules = {
 
 
 for name in modules.keys():
-    modules[name] = importlib.import_module(f".module.{name}", package=__package__)
+    modules[name] = importlib.import_module(f"blenderbim.bim.module.{name}")
 
 
 classes = [
     operator.AddIfcFile,
     operator.BIM_OT_add_section_plane,
     operator.BIM_OT_delete_object,
-    operator.BIM_OT_open_webbrowser,
     operator.BIM_OT_remove_section_plane,
     operator.BIM_OT_select_object,
     operator.BIM_OT_show_description,
+    operator.BIM_OT_multiple_file_selector,
     operator.ClippingPlaneCutWithCappings,
+    operator.CloseBlendWarning,
     operator.CloseError,
     operator.EditBlenderCollection,
     operator.FileAssociate,
@@ -121,6 +122,7 @@ classes = [
     prop.StrProperty,
     operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
     prop.ObjProperty,
+    prop.MultipleFileSelect,
     prop.Attribute,
     prop.BIMAreaProperties,
     prop.BIMTabProperties,
@@ -168,6 +170,7 @@ classes = [
     ui.BIM_PT_tab_services,
     ui.BIM_PT_tab_zones,
     ui.BIM_PT_tab_solar_analysis,
+    ui.BIM_PT_tab_lighting,
     # Structural analysis
     ui.BIM_PT_tab_structural,
     # Construction scheduling
@@ -195,7 +198,6 @@ for mod in modules.values():
 addon_keymaps = []
 icons = None
 is_registering = False
-last_commit_hash = "8888888"
 original_scene_panels_polls: dict[bpy.types.Panel, Union[Callable, None]] = dict()
 
 
@@ -289,7 +291,7 @@ def unregister():
             km.keymap_items.remove(kmi)
     addon_keymaps.clear()
 
-    from . import tool
+    import blenderbim.tool as tool
 
     # use tuple() as method will be removing keys from dict
     for panel in tuple(original_scene_panels_polls.keys()):

src/blenderbim/blenderbim/bim/data/webui/sioserver.py

@@ -1,3 +1,13 @@
+import sys
+import os
+import webbrowser
+
+blenderbim_lib_path = os.environ.get("BLENDERBIM_LIB_PATH")
+blenderbim_version = os.environ.get("BLENDERBIM_VERSION")
+
+if blenderbim_lib_path:
+    sys.path.insert(0, blenderbim_lib_path)
+
 import argparse
 from aiohttp import web
 import socketio
@@ -21,6 +31,8 @@ sio = socketio.AsyncServer(
 app = web.Application()
 sio.attach(app)
 
+
+# represents a caching for blender messages
 blender_messages = {}
 
 
@@ -31,6 +43,8 @@ class WebNamespace(socketio.AsyncNamespace):
 
     async def on_connect(self, sid, environ):
         print(f"Web client connected: {sid}")
+        if blender_messages:
+            await self.send_cached_messages(sid)
 
     async def on_disconnect(self, sid):
         print(f"Web client disconnected: {sid}")
@@ -40,9 +54,24 @@ class WebNamespace(socketio.AsyncNamespace):
             "web_operator",
             data,
             namespace="/blender",
-            room=data["blenderId"],
+            room=data.get("blenderId", None),
         )
 
+    async def on_get_svg(self, sid, data):
+        print("hello world!")
+        file_path = data["path"]
+        with open(file_path, "r") as file:
+            svg_data = file.read()
+        await sio.emit("svg_data", svg_data, room=sid, namespace="/web")
+
+    async def send_cached_messages(self, sid):
+        # Send cached messages to the connected web client
+        for blenderId, messages in blender_messages.items():
+            if "csv_data" in messages:
+                await self.emit("csv_data", {"blenderId": blenderId, "data": messages["csv_data"]}, room=sid)
+            if "gantt_data" in messages:
+                await self.emit("gantt_data", {"blenderId": blenderId, "data": messages["gantt_data"]}, room=sid)
+
 
 # Blender namespace
 class BlenderNamespace(socketio.AsyncNamespace):
@@ -65,7 +94,7 @@ class BlenderNamespace(socketio.AsyncNamespace):
     async def on_data(self, sid, data):
         print(f"Data from Blender client {sid}")
         # blender_messages[sid]["default_data"] = data
-        # await sio.emit("default_data", {"blenderId": sid, "data": data}, namespace="/web")
+        await sio.emit("default_data", {"blenderId": sid, "data": data}, namespace="/web")
 
     async def on_csv_data(self, sid, data):
         print(f"CSV data from Blender client {sid}")
@@ -78,6 +107,12 @@ class BlenderNamespace(socketio.AsyncNamespace):
         blender_messages[sid]["gantt_data"] = data
         await sio.emit("gantt_data", {"blenderId": sid, "data": data}, namespace="/web")
 
+    async def on_drawings_data(self, sid, data):
+        print(f"Drawings directory from Blender client {sid}")
+        print(data)
+        blender_messages[sid]["drwings_data"] = data
+        await sio.emit("drawings_data", {"blenderId": sid, "data": data}, namespace="/web")
+
 
 # Attach namespaces
 sio.register_namespace(WebNamespace("/web"))
@@ -88,21 +123,45 @@ sio.register_namespace(BlenderNamespace("/blender"))
 async def index(request):
     with open("templates/index.html", "r") as f:
         template = f.read()
-    html_content = pystache.render(template, {"port": sio_port})
+    html_content = pystache.render(template, {"port": sio_port, "version": blenderbim_version})
     return web.Response(text=html_content, content_type="text/html")
 
 
 async def gantt(request):
     with open("templates/gantt.html", "r") as f:
         template = f.read()
+    html_content = pystache.render(template, {"port": sio_port, "version": blenderbim_version})
+    return web.Response(text=html_content, content_type="text/html")
+
+
+async def drawings(request):
+    with open("templates/drawings.html", "r") as f:
+        template = f.read()
     html_content = pystache.render(template, {"port": sio_port})
     return web.Response(text=html_content, content_type="text/html")
 
 
+async def on_startup(app):
+    pid_file = "running_pid.json"
+
+    if os.path.exists(pid_file):
+        with open(pid_file, "r") as f:
+            pids = json.load(f)
+    else:
+        pids = {}
+
+    pids[str(os.getpid())] = sio_port
+
+    with open(pid_file, "w") as f:
+        json.dump(pids, f, indent=4)
+
+
 app.router.add_get("/", index)
+app.router.add_get("/drawings", drawings)
 app.router.add_get("/gantt", gantt)
 app.router.add_static("/jsgantt/", path="../gantt", name="jsgantt")
 app.router.add_static("/static/", path="./static", name="static")
+app.on_startup.append(on_startup)
 
 
 def main():

src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css

@@ -0,0 +1,249 @@
+:root {
+    --font-family: Arial, sans-serif;
+    --base-font-size: 16px;
+    --margin-tiny: 0.125rem;
+    --margin-small: 0.625rem;
+    --margin-medium: 1.25rem;
+    --margin-large: 2.5rem;
+    --padding-tiny: 0.125rem;
+    --padding-small: 0.625rem;
+    --padding-medium: 1rem;
+    --font-size-large: 1.2rem;
+    --logo-height: 2.5rem;
+    --nav-height: 2.5rem;
+}
+
+:root.dark {
+    color-scheme: dark;
+    --bg-color: #252525;
+    --text-color: #e0e0e0;
+    --nav-bg-color: #121212;
+    --nav-border-color: #25682a;
+    --nav-link-color: #fff;
+    --nav-link-hover-color: #3fb449;
+    --warning-color: #FFDB8F;
+    --border-color: #464444;
+}
+
+:root.light {
+    color-scheme: light;
+    --bg-color: #ffffff;
+    --text-color: #000000;
+    --nav-bg-color: #f8f8f8;
+    --nav-border-color: #cccccc;
+    --nav-link-color: #000000;
+    --nav-link-hover-color: #38a63d;
+    --warning-color: #FF4500;
+    --border-color: #222;
+}
+
+html {
+    font-size: var(--base-font-size);
+    color: var(--text-color);
+}
+
+body {
+    background-color: var(--bg-color);
+    color: var(--text-color);
+    margin: 0;
+    font-family: var(--font-family);
+}
+
+#container {
+    margin-top: var(--margin-medium);
+    margin-left: var(--margin-small);
+    margin-right: var(--margin-small);
+    margin-bottom: var(--margin-medium);
+    height: calc(100vh - var(--nav-height));
+    box-sizing: border-box;
+    display: flex;
+}
+
+h3 {
+    margin-top: 0;
+}
+
+nav {
+    background-color: var(--nav-bg-color);
+    height: var(--nav-height);
+    padding: var(--padding-medium) 0;
+    display: flex;
+    align-items: center;
+    position: relative;
+    border-bottom: 2px solid var(--nav-border-color);
+}
+
+nav .logo {
+    margin-left: var(--margin-large);
+    height: var(--logo-height);
+}
+
+nav ul {
+    list-style-type: none;
+    margin: 0;
+    margin-left: 0.0625rem;
+    display: flex;
+    flex-grow: 1;
+    justify-content: center;
+}
+
+nav ul li {
+    margin-right: 3.125rem;
+}
+
+nav ul li a {
+    text-decoration: none;
+    color: var(--nav-link-color);
+    font-size: var(--font-size-large);
+}
+
+nav ul li a:hover,
+nav ul li a.active {
+    color: var(--nav-link-hover-color);
+}
+
+.warning {
+    color: var(--warning-color);
+    margin-bottom: var(--margin-small);
+    padding: var(--padding-tiny);
+    display: none;
+}
+
+#toggle-theme {
+    border: none;
+    background: none;
+    cursor: pointer;
+    font-size: var(--font-size-large);
+    margin-right: var(--margin-medium);
+}
+
+#toggle-theme:focus {
+    outline: none;
+}
+
+#client-list {
+    position: absolute;
+    top: calc(0 + var(--nav-height));
+    overflow-y: auto;
+    overflow: hidden;
+    transition: opacity 0.3s ease-out, visibility 0.3s ease-out;
+    border: 1px solid var(--table-border-color);
+    background-color: var(--nav-bg-color);
+    z-index: 1;
+    opacity: 0;
+    visibility: hidden;
+    width: auto;
+}
+
+#client-list.show {
+    opacity: 1;
+    visibility: visible;
+}
+
+#connected-list-div {
+    display: inline-block;
+}
+
+.client {
+    padding: var(--margin-small);
+    border-bottom: 1px solid var(--table-border-color);
+    cursor: pointer;
+}
+
+.client-details {
+    max-height: 0;
+    overflow: hidden;
+    padding-left: var(--padding-small);
+    transition: max-height 0.2s ease-out, padding 0.2s ease-out, opacity 0.1s ease-out;
+    background-color: var(--nav-bg-color);
+    margin-top: var(--margin-tiny);
+    opacity: 0;
+}
+
+.client-details.show {
+    max-height: none;
+    opacity: 1;
+}
+
+.client-detail {
+    border-bottom: 1px solid var(--table-border-color);
+    padding: var(--padding-small);
+}
+
+#show-connected-button {
+    width: auto;
+    background-color: var(--bg-color);
+    border: none;
+    font-size: var(--base-font-size);
+}
+
+#show-connected-button:hover,
+.scroll-button:hover {
+    cursor: pointer;
+}
+
+.scroll-button {
+    font-size: var(--base-font-size);
+    margin-left: var(--margin-tiny);
+    margin-top: var(--margin-small);
+}
+
+
+.left {
+    flex: 1;
+    background-color: var(--bg-color);
+    display: flex;
+    flex-direction: column;
+    padding: 20px;
+}
+
+.right {
+    flex: 4;
+    background-color: var(--bg-color);
+    border: 1px solid var(--border-color);
+}
+
+#svg-container {
+    height: 100%;
+}
+
+.panel {
+    background-color: var(--nav-bg-color);
+    border: 1px solid var(--border-color);
+    padding: 10px;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.card-header,
+.card-body {
+    background-color: var(--bg-color);
+    border: 1px solid var(--border-color);
+    overflow: auto;
+}
+
+.card {
+    background-color: var(--nav-bg-color);
+    overflow: auto;
+}
+
+li.svg-name {
+    list-style-type: none;
+}
+
+#dropdown-menu:focus {
+    outline: none;
+}
+
+/* remove bootstrap css confilcts */
+*,
+::after,
+::before {
+    box-sizing: unset;
+}
+
+.btn,
+.btn:hover {
+    color: var(--nav-link-hover-color);
+}

src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css

@@ -1,19 +1,75 @@
 :root {
+    --font-family: Arial, sans-serif;
+    --base-font-size: 16px;
+    --margin-tiny: 0.125rem;
+    --margin-small: 0.625rem;
+    --margin-medium: 1.25rem;
+    --margin-large: 2.5rem;
+    --padding-tiny: 0.125rem;
+    --padding-small: 0.625rem;
+    --padding-medium: 1rem;
+    --font-size-small: 1rem;
+    --font-size-large: 1.2rem;
+    --logo-height: 2.5rem;
+    --nav-height: 2.5rem;
+    --folder-collapse-font-size: 0.75rem;
+    --folder-collapse-font-family: Courier, "Courier New", monospace;
+    --box-shadow: 0 0 0.7rem #5f5f5f66;
+}
+
+:root.dark {
     color-scheme: dark;
+    --bg-color: #252525;
+    --primary-text-color: #e0e0e0;
+    --secondary-text-color: #c7c7c7;
+    --nav-bg-color: #121212;
+    --nav-border-color: #25682a;
+    --nav-link-color: #fff;
+    --nav-link-hover-color: #3fb449;
+    --warning-color: #FFDB8F;
+    --border-color: #464444;
+    --hover-bg-color: #3a3a3a;
+    --highlight-color: #009136;
+    --task-complete-bg-color: #777777;
+    --milestone-border-color: #ffffff;
+    --group-item-bg-color: #4b4b4b;
+    --input-bg-color: #3b3b3b;
+    --input-border-color: #000;
+    --details-border-color: #464444;
+}
+
+:root.light {
+    color-scheme: light;
+    --bg-color: #ffffff;
+    --primary-text-color: #000000;
+    --nav-bg-color: #f8f8f8;
+    --nav-border-color: #cccccc;
+    --nav-link-color: #000000;
+    --nav-link-hover-color: #38a63d;
+    --warning-color: #FF4500;
+    --details-border-color: #222;
+}
+
+html {
+    font-size: var(--base-font-size);
 }
 
 body {
-    background-color: #252525;
-    color: #e0e0e0;
+    background-color: var(--bg-color);
+    color: var(--primary-text-color);
     margin: 0;
-    font-family: Arial, sans-serif;
+    font-family: var(--font-family);
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
 }
 
 #container {
-    margin-top: 20px;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin-bottom: 20px;
+    flex: 1;
+    margin-top: var(--margin-medium);
+    margin-left: var(--margin-small);
+    margin-right: var(--margin-small);
+    margin-bottom: var(--margin-medium);
 }
 
 h3 {
@@ -21,79 +77,170 @@ h3 {
 }
 
 nav {
-    background-color: #121212;
-    padding: 1em 0;
+    background-color: var(--nav-bg-color);
+    padding: var(--padding-medium) 0;
     display: flex;
     align-items: center;
     position: relative;
+    border-bottom: 2px solid var(--nav-border-color);
 }
 
 nav .logo {
-    margin-left: 40px;
-    height: 40px;
-    /* Adjust height as needed */
+    margin-left: var(--margin-large);
+    height: var(--logo-height);
 }
 
 nav ul {
     list-style-type: none;
     margin: 0;
-    margin-left: 1px;
+    margin-left: 0.0625rem;
     display: flex;
     flex-grow: 1;
     justify-content: center;
 }
 
 nav ul li {
-    margin-right: 50px;
+    margin-right: 3.125rem;
 }
 
 nav ul li a {
     text-decoration: none;
-    color: #fff;
-    font-size: 1.2em;
+    color: var(--nav-link-color);
+    font-size: var(--font-size-large);
 }
 
 nav ul li a:hover,
 nav ul li a.active {
-    color: #3fb449;
+    color: var(--nav-link-hover-color);
 }
 
-nav .bottom-bar {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #25682a;
+.warning {
+    color: var(--warning-color);
+    margin-bottom: var(--margin-small);
+    padding: var(--padding-tiny);
+    display: none;
 }
 
 .table-description {
-    margin-bottom: 1rem;
+    margin-bottom: var(--margin-medium);
     width: 50%;
     background-color: transparent;
     border-collapse: collapse;
     border-spacing: 0;
-    border-color: #464444;
-    border: 1px solid #464444;
+    border-color: var(--border-color);
+    border: 1px solid var(--border-color);
     border-radius: 0.25rem;
-    box-shadow: 0 0 0.7rem rgba(95, 95, 95, 0.4);
+    box-shadow: var(--box-shadow);
     text-align: center;
 }
 
 .table-description tr {
     display: table-row;
-    border-bottom: 1px solid #464444;
+    border-bottom: 1px solid var(--border-color);
+}
+
+#toggle-theme {
+    border: none;
+    background: none;
+    cursor: pointer;
+    font-size: var(--font-size-large);
+    margin-right: var(--margin-medium);
+}
+
+#toggle-theme:focus {
+    outline: none;
+}
+
+#client-list {
+    position: absolute;
+    top: calc(0 + var(--nav-height));
+    overflow-y: auto;
+    overflow: hidden;
+    transition: opacity 0.3s ease-out, visibility 0.3s ease-out;
+    border: 1px solid var(--table-border-color);
+    background-color: var(--nav-bg-color);
+    z-index: 1;
+    opacity: 0;
+    visibility: hidden;
+    width: auto;
+}
+
+#client-list.show {
+    opacity: 1;
+    visibility: visible;
+}
+
+#connected-list-div {
+    display: inline-block;
+}
+
+.client {
+    padding: var(--margin-small);
+    border-bottom: 1px solid var(--table-border-color);
+    cursor: pointer;
+}
+
+.client-details {
+    max-height: 0;
+    overflow: hidden;
+    padding-left: var(--padding-small);
+    transition: max-height 0.2s ease-out, padding 0.2s ease-out, opacity 0.1s ease-out;
+    background-color: var(--nav-bg-color);
+    margin-top: var(--margin-tiny);
+    opacity: 0;
+}
+
+.client-details.show {
+    max-height: none;
+    opacity: 1;
+}
+
+.client-detail {
+    border-bottom: 1px solid var(--table-border-color);
+    padding: var(--padding-small);
+}
+
+#show-connected-button {
+    width: auto;
+    background-color: var(--bg-color);
+    border: none;
+    font-size: var(--base-font-size);
+}
+
+#show-connected-button:hover,
+.scroll-button:hover {
+    cursor: pointer;
+}
+
+.scroll-button {
+    font-size: var(--base-font-size);
+    margin-left: var(--margin-tiny);
+    margin-top: var(--margin-small);
+}
+
+footer {
+    background-color: var(--nav-bg-color);
+    text-align: right;
+    padding: var(--padding-tiny);
+    border-top: 1px solid var(--nav-border-color);
+}
+
+footer p {
+    margin: 0;
+    color: var(--text-color);
+    margin-right: var(--margin-small);
+    font-size: 0.8rem;
 }
 
 .gantt-info {
     margin: 0.5rem;
-    font-size: 1rem;
+    font-size: var(--font-size-small);
     font-weight: bold;
 }
 
 .btn {
     margin: 0.5rem;
-    font-size: 1rem;
+    font-size: var(--font-size-small);
     cursor: pointer;
 }
 
@@ -104,86 +251,76 @@ nav .bottom-bar {
 }
 
 /* ------------ Overwriting JSGantt CSS rules ------------ */
-
-div.gantt {
-    background-color: #252525;
-    color: #c7c7c7;
+:root.dark div.gantt {
+    background-color: var(--bg-color);
+    color: var(--secondary-text-color);
 }
 
-.gantt table {
-    border-color: #464444;
-    ;
-}
-
-.gantt td {
-    border-color: #464444;
-    ;
+:root.dark .gantt table,
+:root.dark .gantt td {
+    border-color: var(--border-color);
 }
 
 /* Headings and cell defaults */
-.gmajorheading,
-.gminorheading,
-.gminorheadingwkend,
-.gtaskcell,
-.gtaskcellcurrent,
-.gtaskcellwkend,
-.gname,
-.ggroupitem,
-.gtaskheading {
-    background-color: #252525;
-    border-color: #464444;
-    ;
+:root.dark .gmajorheading,
+:root.dark .gminorheading,
+:root.dark .gminorheadingwkend,
+:root.dark .gtaskcell,
+:root.dark .gtaskcellcurrent,
+:root.dark .gtaskcellwkend,
+:root.dark .gname,
+:root.dark .ggroupitem,
+:root.dark .gtaskheading {
+    background-color: var(--bg-color);
+    border-color: var(--border-color);
 }
 
-.gtaskheading,
-.gname,
-.gtaskname,
-.gres,
-.gdur,
-.gcomp,
-.gstartdate,
-.gplanstartdate,
-.gplanenddate,
-.gcost,
-.gchartlbl,
-.gcontainercol,
-.genddate {
-    color: #c7c7c7;
-    border-color: #464444;
-    ;
+:root.dark .gtaskheading,
+:root.dark .gname,
+:root.dark .gtaskname,
+:root.dark .gres,
+:root.dark .gdur,
+:root.dark .gcomp,
+:root.dark .gstartdate,
+:root.dark .gplanstartdate,
+:root.dark .gplanenddate,
+:root.dark .gcost,
+:root.dark .gchartlbl,
+:root.dark .gcontainercol,
+:root.dark .genddate {
+    color: var(--secondary-text-color);
+    border-color: var(--border-color);
 }
 
-.gtaskname>div {
-    color: #c7c7c7;
+:root.dark .gtaskname>div {
+    color: var(--secondary-text-color);
 }
 
-.gtaskbarcontainer.gplan,
-.gchartlbl.gcontainercol {
-    background: #252525;
-    border-color: #464444;
+:root.dark .gtaskbarcontainer.gplan,
+:root.dark .gchartlbl.gcontainercol {
+    background: var(--bg-color);
+    border-color: var(--border-color);
 }
 
-.gtaskname div,
-.gtaskheading div,
-.gtaskname span {
-    color: #c7c7c7;
+:root.dark .gtaskname div,
+:root.dark .gtaskheading div,
+:root.dark .gtaskname span {
+    color: var(--secondary-text-color);
 }
 
-
-.gtasklist,
-.gadditional {
-    border: #464444 1px solid
+:root.dark .gtasklist,
+:root.dark .gadditional {
+    border: var(--border-color) 1px solid;
 }
 
-.gchartgrid {
-    background-color: #252525;
+:root.dark .gchartgrid {
+    background-color: var(--bg-color);
 }
 
-.glistgrid,
-.glistlbl {
-    background-color: #252525;
-    border-color: #464444;
-    ;
+:root.dark .glistgrid,
+:root.dark .glistlbl {
+    background-color: var(--bg-color);
+    border-color: var(--border-color);
 }
 
 /* .gTaskInfo {
@@ -193,88 +330,81 @@ div.gantt {
 } */
 
 /* Dark mode scrollbar */
-.frame::-webkit-scrollbar-thumb {
-    background-color: #252525;
-}
-
-.frame::-webkit-scrollbar-track {
-    background-color: #252525;
+:root.dark .frame::-webkit-scrollbar-thumb,
+:root.dark .frame::-webkit-scrollbar-track {
+    background-color: var(--bg-color);
 }
 
 /* Highlight row */
-.gitemhighlight td {
-    background-color: #009136;
-    color: #ffffff;
+:root.dark .gitemhighlight td {
+    background-color: var(--highlight-color);
+    color: var(--nav-link-color);
 }
 
 /* Differentiate Group, Milestone and Ordinary task items (applied to row) */
-.ggroupitem {
-    background-color: #252525;
+:root.dark .ggroupitem {
+    background-color: var(--bg-color);
     font-weight: bold;
-    border-color: #464444;
+    border-color: var(--border-color);
 }
 
-.gmileitem,
-.glineitem {
-    background-color: #252525;
+:root.dark .gmileitem,
+:root.dark .glineitem {
+    background-color: var(--bg-color);
 }
 
 /* Task bar caption text styles */
-.gmilecaption,
-.ggroupcaption,
-.gcaption {
-    color: #ffffff;
+:root.dark .gmilecaption,
+:root.dark .ggroupcaption,
+:root.dark .gcaption {
+    color: var(--nav-link-color);
 }
 
 /* Task complete %age bar */
-.gtaskcomplete {
-    background-color: #777777;
+:root.dark .gtaskcomplete {
+    background-color: var(--task-complete-bg-color);
 }
 
 /* Milestones */
-.gmdtop {
-    border-bottom: 5px solid #ffffff;
+:root.dark .gmdtop,
+:root.dark .gmdbottom {
+    border-bottom: 5px solid var(--milestone-border-color);
 }
 
-.gmdbottom {
-    border-top: 5px solid #ffffff;
-}
-
-.gfoldercollapse {
-    color: #c7c7c7;
+:root.dark .gfoldercollapse {
+    color: var(--secondary-text-color);
     cursor: pointer;
     font-weight: bold;
-
-    font-size: 12px;
-    font-family: Courier, "Courier New", monospace;
+    font-size: var(--folder-collapse-font-size);
+    font-family: var(--folder-collapse-font-family);
 }
 
 /* Highlight for collapsible row */
-.gname.ggroupitem {
-    background-color: rgb(75, 75, 75);
+:root.dark .gname.ggroupitem {
+    background-color: var(--group-item-bg-color);
 }
 
 /* Form label and selected highlighting */
-.gformlabel {
-    background-color: #2e2e2e;
-    color: #c7c7c7;
-    border: #4a4a4a 1px solid;
+:root.dark .gformlabel {
+    background-color: var(--formlabel-bg-color);
+    color: var(--secondary-text-color);
+    border: var(--formlabel-border-color) 1px solid;
 }
 
-span.gformlabel:hover {
-    background-color: #3a3a3a;
-    border-color: #565656;
+:root.dark span.gformlabel:hover {
+    background-color: var(--hover-bg-color);
+    border-color: var(--border-color);
 }
 
-span.gselected {
-    background-color: #565656;
-    border-color: #777777;
-    color: #ffffff;
+:root.dark span.gselected {
+    background-color: var(--formlabel-selected-bg-color);
+    border-color: var(--task-complete-bg-color);
+    color: var(--nav-link-color);
 }
 
-.gantt-inputtable {
-    background-color: #3b3b3b;
+:root.dark .gantt-inputtable {
+    background-color: var(--input-bg-color);
     box-sizing: border-box;
-    border: 1px solid #000;
-    color: #c7c7c7;
+    border: 1px solid var(--input-border-color);
+    color: var(--secondary-text-color);
 }

src/blenderbim/blenderbim/bim/data/webui/static/css/index.css

@@ -1,27 +1,62 @@
 :root {
+    --font-family: Arial, sans-serif;
+    --base-font-size: 16px;
+    --margin-tiny: 0.125rem;
+    --margin-small: 0.625rem;
+    --margin-medium: 1.25rem;
+    --margin-large: 2.5rem;
+    --padding-tiny: 0.125rem;
+    --padding-small: 0.625rem;
+    --padding-medium: 1rem;
+    --font-size-large: 1.2rem;
+    --logo-height: 2.5rem;
+    --nav-height: 2.5rem;
+}
+
+:root.dark {
     color-scheme: dark;
+    --bg-color: #252525;
+    --text-color: #e0e0e0;
+    --nav-bg-color: #121212;
+    --nav-border-color: #25682a;
+    --nav-link-color: #fff;
+    --nav-link-hover-color: #3fb449;
+    --warning-color: #FFDB8F;
+    --table-border-color: #464444;
+}
+
+:root.light {
+    color-scheme: light;
+    --bg-color: #ffffff;
+    --text-color: #000000;
+    --nav-bg-color: #f8f8f8;
+    --nav-border-color: #cccccc;
+    --nav-link-color: #000000;
+    --nav-link-hover-color: #38a63d;
+    --warning-color: #FF4500;
+    --table-border-color: #222;
+}
+
+html {
+    font-size: var(--base-font-size);
 }
 
 body {
-    background-color: #252525;
-    color: #e0e0e0;
+    background-color: var(--bg-color);
+    color: var(--text-color);
     margin: 0;
-    font-family: Arial, sans-serif;
+    font-family: var(--font-family);
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
 }
 
 #container {
-    margin-top: 20px;
-    margin-left: 10px;
-    margin-right: 10px;
-    margin-bottom: 20px
-}
-
-.table-container {
-    margin-bottom: 40px;
-}
-
-.csv-table {
-    margin-top: 10px;
+    flex: 1;
+    margin-top: var(--margin-medium);
+    margin-left: var(--margin-small);
+    margin-right: var(--margin-small);
+    margin-bottom: var(--margin-medium);
 }
 
 h3 {
@@ -29,48 +64,161 @@ h3 {
 }
 
 nav {
-    background-color: #121212;
-    padding: 1em 0;
+    background-color: var(--nav-bg-color);
+    height: var(--nav-height);
+    padding: var(--padding-medium) 0;
     display: flex;
     align-items: center;
     position: relative;
+    border-bottom: 2px solid var(--nav-border-color);
 }
 
 nav .logo {
-    margin-left: 40px;
-    height: 40px;
-    /* Adjust height as needed */
+    margin-left: var(--margin-large);
+    height: var(--logo-height);
 }
 
 nav ul {
     list-style-type: none;
     margin: 0;
-    margin-left: 1px;
+    margin-left: 0.0625rem;
     display: flex;
     flex-grow: 1;
     justify-content: center;
 }
 
 nav ul li {
-    margin-right: 50px;
+    margin-right: 3.125rem;
 }
 
 nav ul li a {
     text-decoration: none;
-    color: #fff;
-    font-size: 1.2em;
+    color: var(--nav-link-color);
+    font-size: var(--font-size-large);
 }
 
 nav ul li a:hover,
 nav ul li a.active {
-    color: #3fb449;
+    color: var(--nav-link-hover-color);
 }
 
-nav .bottom-bar {
+.warning {
+    color: var(--warning-color);
+    margin-bottom: var(--margin-small);
+    padding: var(--padding-tiny);
+    display: none;
+}
+
+#toggle-theme {
+    border: none;
+    background: none;
+    cursor: pointer;
+    font-size: var(--font-size-large);
+    margin-right: var(--margin-medium);
+}
+
+#toggle-theme:focus {
+    outline: none;
+}
+
+#client-list {
     position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #25682a;
+    top: calc(0 + var(--nav-height));
+    overflow-y: auto;
+    overflow: hidden;
+    transition: opacity 0.3s ease-out, visibility 0.3s ease-out;
+    border: 1px solid var(--table-border-color);
+    background-color: var(--nav-bg-color);
+    z-index: 1;
+    opacity: 0;
+    visibility: hidden;
+    width: auto;
+}
+
+#client-list.show {
+    opacity: 1;
+    visibility: visible;
+}
+
+#connected-list-div {
+    display: inline-block;
+}
+
+.client {
+    padding: var(--margin-small);
+    border-bottom: 1px solid var(--table-border-color);
+    cursor: pointer;
+}
+
+.client-details {
+    max-height: 0;
+    overflow: hidden;
+    padding-left: var(--padding-small);
+    transition: max-height 0.2s ease-out, padding 0.2s ease-out, opacity 0.1s ease-out;
+    background-color: var(--nav-bg-color);
+    margin-top: var(--margin-tiny);
+    opacity: 0;
+}
+
+.client-details.show {
+    max-height: none;
+    opacity: 1;
+}
+
+.client-detail {
+    border-bottom: 1px solid var(--table-border-color);
+    padding: var(--padding-small);
+}
+
+#show-connected-button {
+    width: auto;
+    background-color: var(--bg-color);
+    border: none;
+    font-size: var(--base-font-size);
+}
+
+#show-connected-button:hover,
+.scroll-button:hover {
+    cursor: pointer;
+}
+
+.scroll-button {
+    font-size: var(--base-font-size);
+    margin-left: var(--margin-tiny);
+    margin-top: var(--margin-small);
+}
+
+footer {
+    background-color: var(--nav-bg-color);
+    text-align: right;
+    padding: var(--padding-tiny);
+    border-top: 1px solid var(--nav-border-color);
+}
+
+footer p {
+    margin: 0;
+    color: var(--text-color);
+    margin-right: var(--margin-small);
+    font-size: 0.8rem;
+}
+
+.table-container {
+    margin-bottom: var(--margin-large);
+}
+
+.csv-table {
+    margin-top: var(--margin-small);
+}
+
+/* ------------ Overwriting Tabulator CSS rules ------------ */
+
+:root.light .tabulator-header,
+:root.light .tabulator .tabulator-header .tabulator-col {
+    background: var(--nav-bg-color) !important;
+    color: var(--text-color);
+}
+
+:root.light .tabulator {
+    border-top: 1px solid var(--table-border-color);
+    border-bottom: 2px solid var(--table-border-color);
 }

src/blenderbim/blenderbim/bim/data/webui/static/js/drawings.js

@@ -0,0 +1,263 @@
+// keeps track of blenders connected
+const connectedClients = {};
+const allDrawings = {};
+let socket;
+
+// Document ready function
+$(document).ready(function () {
+  var systemTheme = window.matchMedia("(prefers-color-scheme: light)").matches
+    ? "light"
+    : "dark";
+  var theme = localStorage.getItem("theme") || systemTheme;
+  setTheme(theme);
+
+  $("#dropdown-menu").change(function () {
+    const blenderId = $(this).attr("id");
+    const ifcFile = $(this).val();
+    displayDrawingsNames(blenderId, ifcFile);
+  });
+
+  connectSocket();
+});
+
+// Function to connect to Socket.IO server
+function connectSocket() {
+  const url = "ws://localhost:" + SOCKET_PORT + "/web";
+  socket = io(url);
+  console.log("socket: ", socket);
+
+  // Register socket event handlers
+  socket.on("blender_connect", handleBlenderConnect);
+  socket.on("blender_disconnect", handleBlenderDisconnect);
+  socket.on("connect", handleWebConnect);
+  socket.on("drawings_data", handleDrawingsData);
+  socket.on("svg_data", handleSvgData);
+  //   socket.on("default_data", handleDefaultData);
+}
+
+// function used to get drawings data from blenderbim
+function handleWebConnect() {
+  const msg = {
+    sourcePage: "drawings",
+    operator: {
+      type: "getDrawings",
+    },
+  };
+  socket.emit("web_operator", msg);
+}
+
+// Function to handle 'blender_connect' event
+function handleBlenderConnect(blenderId) {
+  console.log("blender_connect: ", blenderId);
+  if (!connectedClients.hasOwnProperty(blenderId)) {
+    connectedClients[blenderId] = {
+      shown: false,
+      ifc_file: "",
+    };
+  }
+}
+
+// Function to handle 'blender_disconnect' event
+function handleBlenderDisconnect(blenderId) {
+  console.log("blender_disconnect: ", blenderId);
+  if (connectedClients.hasOwnProperty(blenderId)) {
+    delete connectedClients[blenderId];
+    // remove(blenderId);
+  }
+
+  $("#blender-count").text(function (i, text) {
+    return parseInt(text, 10) - 1;
+  });
+}
+
+function handleDrawingsData(data) {
+  const blenderId = data["blenderId"];
+
+  console.log(data);
+
+  const filename = data["data"]["ifc_file"];
+  const drawings = data["data"]["drawings_data"]["drawings"];
+  const sheets = data["data"]["drawings_data"]["sheets"];
+
+  allDrawings[filename] = { drawings: drawings, sheets: sheets };
+
+  console.log(connectedClients);
+
+  if (connectedClients.hasOwnProperty(blenderId)) {
+    if (!connectedClients[blenderId].shown) {
+      connectedClients[blenderId] = {
+        shown: true,
+        ifc_file: filename,
+      };
+      addSelectOption(blenderId, filename);
+    } else {
+      // update(blenderId, data, filename);
+    }
+  } else {
+    connectedClients[blenderId] = {
+      shown: true,
+      ifc_file: filename,
+    };
+    addSelectOption(blenderId, filename);
+  }
+}
+
+function handleSvgData(data) {
+  const svgContainer = document.getElementById("svg-container");
+  svgContainer.innerHTML = "";
+  svgContainer.style.backgroundColor = "white";
+
+  const dom = SVG(svgContainer).svg(data);
+  const svgElement = dom.node.children[0];
+
+  // to make the svg not grow outside the svg container
+  svgElement.setAttribute("width", "100%");
+  svgElement.setAttribute("height", "100%");
+  svgElement.style.maxWidth = "100%";
+  svgElement.style.maxHeight = "100%";
+  svgElement.style.width = "100%";
+  svgElement.style.height = "100%";
+  svgElement.style.boxSizing = "border-box"; // Ensure padding and borders are included in the element's total width and height
+
+  const panZoomControls = svgPanZoom(svgElement, {
+    zoomEnabled: true,
+    controlIconsEnabled: true,
+    fit: true,
+    center: true,
+  });
+}
+
+function addSelectOption(blenderId, filename) {
+  const filenameOption = $("<option></option>")
+    .attr("id", "blender-" + blenderId)
+    .val(filename)
+    .text(filename);
+  $("#dropdown-menu").append(filenameOption);
+}
+
+function displayDrawingsNames(blenderId, ifcFile) {
+  drawings = allDrawings[ifcFile].drawings;
+  sheets = allDrawings[ifcFile].sheets;
+
+  function createSvgNames(text, index, type) {
+    var label = $("<li></lio>")
+      .text(text)
+      .attr("id", type + "-" + index)
+      .addClass("svg-name")
+      .click(function () {
+        const id = $(this).attr("id").split("-");
+        const index = parseInt(id[1]);
+        const type = id[0];
+        const ifcFile = $("#dropdown-menu").val();
+
+        var path = "";
+
+        if (type === "drawing") {
+          path = allDrawings[ifcFile].drawings[index].path;
+        } else if (type === "sheet") {
+          path = allDrawings[ifcFile].sheets[index].path;
+        }
+
+        const msg = {
+          path: path,
+        };
+        console.log(msg);
+        socket.emit("get_svg", msg);
+      });
+
+    if (type === "drawing") $("#drawings-sub-panel").append(label);
+    else if (type === "sheet") $("#sheets-sub-panel").append(label);
+  }
+
+  $("#drawings-sub-panel").empty();
+  drawings.forEach(function (drawing, index) {
+    createSvgNames(drawing.name, index, "drawing");
+  });
+
+  $("#sheets-sub-panel").empty();
+  sheets.forEach(function (sheet, index) {
+    createSvgNames(sheet.name, index, "sheet");
+  });
+}
+
+function setTheme(theme) {
+  if (theme === "light") {
+    $("html").removeClass("dark").addClass("light");
+    $("#toggle-theme").html('<i class="fas fa-sun"></i>');
+  } else {
+    $("html").removeClass("light").addClass("dark");
+    $("#toggle-theme").html('<i class="fas fa-moon"></i>');
+  }
+  localStorage.setItem("theme", theme);
+}
+
+function toggleTheme() {
+  if ($("html").hasClass("dark")) {
+    setTheme("light");
+  } else {
+    setTheme("dark");
+  }
+}
+
+function toggleClientList() {
+  var clientList = $("#client-list");
+
+  if (clientList.hasClass("show")) {
+    clientList.removeClass("show");
+    return;
+  }
+
+  clientList.empty();
+
+  $.each(connectedClients, function (id, client) {
+    if (!client.shown) return;
+
+    const dropdownIcon = $("<i>")
+      .addClass("fas fa-chevron-down")
+      .css("margin-left", "0.5rem");
+
+    const clientDiv = $("<div>").addClass("client").text(client.ifc_file);
+
+    clientDiv.append(dropdownIcon);
+
+    const clientDetailsDiv = $("<div>").addClass("client-details");
+
+    if (id) {
+      const clientId = $("<div>")
+        .addClass("client-detail")
+        .text(`Blender ID: ${id}`);
+      clientDetailsDiv.append(clientId);
+    }
+
+    if (client.headers && client.headers.length) {
+      const clientHeaders = $("<div>")
+        .addClass("client-detail")
+        .text(`Table Headers: ${client.headers.join(", ")}`);
+
+      const scrollButton = $("<button>")
+        .addClass("scroll-button")
+        .text("Scroll to Table")
+        .on("click", function () {
+          $("html, body").animate(
+            {
+              scrollTop: $("#table-" + id).offset().top,
+            },
+            600
+          );
+          clientList.removeClass("show");
+        });
+
+      clientDetailsDiv.append(clientHeaders);
+      clientDetailsDiv.append(scrollButton);
+    }
+
+    clientDiv.append(clientDetailsDiv);
+
+    clientDiv.on("click", function () {
+      clientDetailsDiv.toggleClass("show");
+    });
+
+    clientList.append(clientDiv);
+  });
+  clientList.addClass("show");
+}

src/blenderbim/blenderbim/bim/data/webui/static/js/gantt.js

@@ -19,6 +19,12 @@ const pageSizes = [
 
 // Document ready function
 $(document).ready(function () {
+  var systemTheme = window.matchMedia("(prefers-color-scheme: light)").matches
+    ? "light"
+    : "dark";
+  var theme = localStorage.getItem("theme") || systemTheme;
+  setTheme(theme);
+
   connectSocket();
 });
 
@@ -32,6 +38,7 @@ function connectSocket() {
   socket.on("blender_connect", handleBlenderConnect);
   socket.on("blender_disconnect", handleBlenderDisconnect);
   socket.on("gantt_data", handleGanttData);
+  socket.on("default_data", handleDefaultData);
 }
 
 // Function to handle 'blender_connect' event
@@ -53,6 +60,10 @@ function handleBlenderDisconnect(blenderId) {
     delete connectedClients[blenderId];
     removeGanttElement(blenderId);
   }
+
+  $("#blender-count").text(function (i, text) {
+    return parseInt(text, 10) - 1;
+  });
 }
 
 // Function to handle 'gantt_data' event
@@ -61,7 +72,7 @@ function handleGanttData(data) {
 
   console.log(data);
 
-  const filename = data["data"]["IFC_File"];
+  const filename = data["data"]["ifc_file"];
   const ganttTasks = data["data"]["gantt_data"]["tasks"];
   const ganttWorkSched = data["data"]["gantt_data"]["work_schedule"];
   // const ganttWorkSched = {};
@@ -70,6 +81,7 @@ function handleGanttData(data) {
     if (!connectedClients[blenderId].shown) {
       connectedClients[blenderId] = {
         shown: true,
+        ifc_file: filename,
         ganttTasks: ganttTasks,
         workSchedule: ganttWorkSched,
       };
@@ -82,6 +94,7 @@ function handleGanttData(data) {
   } else {
     connectedClients[blenderId] = {
       shown: true,
+      ifc_file: filename,
       ganttTasks: ganttTasks,
       workSchedule: ganttWorkSched,
     };
@@ -89,8 +102,19 @@ function handleGanttData(data) {
   }
 }
 
+function handleDefaultData(data) {
+  const blenderId = data["blenderId"];
+  const isDirty = data["data"]["is_dirty"];
+  showWarning(blenderId, isDirty);
+  console.log(data);
+}
+
 // Function to add a new gantt with data and filename
 function addGanttElement(blenderId, tasks, workSched, filename) {
+  $("#blender-count").text(function (i, text) {
+    return parseInt(text, 10) + 1;
+  });
+
   const ganttContainer = $("<div></div>")
     .addClass("gantt-container")
     .attr("id", "container-" + blenderId);
@@ -101,6 +125,13 @@ function addGanttElement(blenderId, tasks, workSched, filename) {
     .addClass("no-print")
     .css("margin-bottom", "10px");
 
+  const warning = $("<div></div>")
+    .attr("id", "warning-" + blenderId)
+    .html(
+      "&#9888; Warning: This Gantt Chart may contain outdated data due to recent changes in Blender."
+    )
+    .addClass("warning no-print");
+
   const workSchedDiv = $("<div></div>").attr("id", "workSched" + blenderId);
 
   const scheduleTable = $("<table></table>")
@@ -148,6 +179,7 @@ function addGanttElement(blenderId, tasks, workSched, filename) {
   workSchedDiv.append(scheduleTable);
 
   ganttContainer.append(ganttTitle);
+  ganttContainer.append(warning);
   ganttContainer.append(workSchedDiv);
   ganttContainer.append(ganttInfoDiv);
   ganttContainer.append(ganttDiv);
@@ -233,8 +265,7 @@ function addGanttElement(blenderId, tasks, workSched, filename) {
 
     addEventListener("afterprint", (event) => {
       g.setEditable(true);
-    },);
-
+    });
 
     let css =
       "@media print {\n" +
@@ -280,6 +311,7 @@ function updateGanttElement(blenderId, tasks, workSched, filename) {
   g.Draw();
 
   $("#title-" + blenderId).text(filename);
+  $("#warning-" + blenderId).css("display", "none");
 }
 
 // Function to remove gantt element
@@ -287,6 +319,10 @@ function removeGanttElement(blenderId) {
   $("#container-" + blenderId).remove();
 }
 
+function showWarning(blenderId, isDirty) {
+  $("#warning-" + blenderId).css("display", "block");
+}
+
 // Utility function to create a tooltip for the gantt chars
 function generateTooltip(task) {
   var dataObject = task.getDataObject();
@@ -337,3 +373,94 @@ function editValue(list, task, event, cell, column) {
   };
   socket.emit("web_operator", msg);
 }
+
+function setTheme(theme) {
+  if (theme === "light") {
+    $("html").removeClass("dark").addClass("light");
+    $("#toggle-theme").html('<i class="fas fa-sun"></i>');
+  } else {
+    $("html").removeClass("light").addClass("dark");
+    $("#toggle-theme").html('<i class="fas fa-moon"></i>');
+  }
+  localStorage.setItem("theme", theme);
+}
+
+function toggleTheme() {
+  if ($("html").hasClass("dark")) {
+    setTheme("light");
+  } else {
+    setTheme("dark");
+  }
+}
+
+function toggleClientList() {
+  var clientList = $("#client-list");
+
+  if (clientList.hasClass("show")) {
+    clientList.removeClass("show");
+    return;
+  }
+
+  clientList.empty();
+
+  $.each(connectedClients, function (id, client) {
+    if (!client.shown) return;
+
+    const dropdownIcon = $("<i>")
+      .addClass("fas fa-chevron-down")
+      .css("margin-left", "0.5rem");
+
+    const clientDiv = $("<div>").addClass("client").text(client.ifc_file);
+
+    clientDiv.append(dropdownIcon);
+
+    const clientDetailsDiv = $("<div>").addClass("client-details");
+
+    if (id) {
+      const clientId = $("<div>")
+        .addClass("client-detail")
+        .text(`Blender ID: ${id}`);
+      clientDetailsDiv.append(clientId);
+    }
+
+    if (client.workSchedule && client.gantt) {
+      const clientScheduleName = $("<div>")
+        .addClass("client-detail")
+        .text(`Schedule Name: ${client.workSchedule.Name}`);
+
+      const clientScheduleDate = $("<div>")
+        .addClass("client-detail")
+        .text(
+          `Schedule Date: ${new Date(
+            client.workSchedule.CreationDate
+          ).toLocaleDateString()}`
+        );
+
+      const scrollButton = $("<button>")
+        .addClass("scroll-button")
+        .text("Scroll to Gantt Chart")
+        .on("click", function () {
+          $("html, body").animate(
+            {
+              scrollTop: $("#gantt-" + id).offset().top,
+            },
+            600
+          );
+          clientList.removeClass("show");
+        });
+
+      clientDetailsDiv.append(clientScheduleName);
+      clientDetailsDiv.append(clientScheduleDate);
+      clientDetailsDiv.append(scrollButton);
+    }
+
+    clientDiv.append(clientDetailsDiv);
+
+    clientDiv.on("click", function () {
+      clientDetailsDiv.toggleClass("show");
+    });
+
+    clientList.append(clientDiv);
+  });
+  clientList.addClass("show");
+}

src/blenderbim/blenderbim/bim/data/webui/static/js/index.js

@@ -5,6 +5,12 @@ let socket;
 
 // Document ready function
 $(document).ready(function () {
+  var systemTheme = window.matchMedia("(prefers-color-scheme: light)").matches
+    ? "light"
+    : "dark";
+  var theme = localStorage.getItem("theme") || systemTheme;
+  setTheme(theme);
+
   connectSocket();
 });
 
@@ -18,6 +24,7 @@ function connectSocket() {
   socket.on("blender_connect", handleBlenderConnect);
   socket.on("blender_disconnect", handleBlenderDisconnect);
   socket.on("csv_data", handleCsvData);
+  socket.on("default_data", handleDefaultData);
 }
 
 // Function to handle 'blender_connect' event
@@ -35,13 +42,17 @@ function handleBlenderDisconnect(blenderId) {
     delete connectedClients[blenderId];
     removeTableElement(blenderId);
   }
+
+  $("#blender-count").text(function (i, text) {
+    return parseInt(text, 10) - 1;
+  });
 }
 
 // Function to handle 'csv_data' event
 function handleCsvData(data) {
   const blenderId = data["blenderId"];
   const csvData = data["data"]["csv_data"];
-  const filename = data["data"]["IFC_File"];
+  const filename = data["data"]["ifc_file"];
   console.log(data);
 
   if (connectedClients.hasOwnProperty(blenderId)) {
@@ -65,8 +76,19 @@ function handleCsvData(data) {
   }
 }
 
+function handleDefaultData(data) {
+  const blenderId = data["blenderId"];
+  const isDirty = data["data"]["is_dirty"];
+  showWarning(blenderId, isDirty);
+  console.log(data);
+}
+
 // Function to add a new table with data and filename
 function addTableElement(blenderId, csvData, filename) {
+  $("#blender-count").text(function (i, text) {
+    return parseInt(text, 10) + 1;
+  });
+
   // store headers of the csv data
   const firstLine = csvData.indexOf("\n");
   const csvHeaders = csvData.substring(0, firstLine).split(",");
@@ -82,11 +104,19 @@ function addTableElement(blenderId, csvData, filename) {
     .text(filename)
     .css("margin-bottom", "10px");
 
+  const warning = $("<div></div>")
+    .attr("id", "warning-" + blenderId)
+    .html(
+      "&#9888; Warning: This table may contain outdated data due to recent changes in Blender."
+    )
+    .addClass("warning");
+
   const tableDiv = $("<div></div>")
     .addClass("csv-table")
     .attr("id", "table-" + blenderId);
 
   tableContainer.append(tableTitle);
+  tableContainer.append(warning);
   tableContainer.append(tableDiv);
   $("#container").append(tableContainer);
 
@@ -199,6 +229,7 @@ function updateTableElement(blenderId, csvData, filename) {
       connectedClients[blenderId].headers = newHeaders;
     }
     $("#title-" + blenderId).text(filename);
+    $("#warning-" + blenderId).css("display", "none");
   }
 }
 
@@ -207,6 +238,10 @@ function removeTableElement(blenderId) {
   $("#container-" + blenderId).remove();
 }
 
+function showWarning(blenderId, isDirty) {
+  $("#warning-" + blenderId).css("display", "block");
+}
+
 // Utility function to compare two csv header
 function compareHeaders(headers1, headers2) {
   if (headers1.length !== headers2.length) {
@@ -219,3 +254,94 @@ function compareHeaders(headers1, headers2) {
   }
   return true;
 }
+
+function setTheme(theme) {
+  var stylesheet = $("#tabulator-stylesheet");
+  if (theme === "light") {
+    stylesheet.attr(
+      "href",
+      "https://unpkg.com/tabulator-tables/dist/css/tabulator_site.min.css"
+    );
+    $("html").removeClass("dark").addClass("light");
+    $("#toggle-theme").html('<i class="fas fa-sun"></i>');
+  } else {
+    stylesheet.attr(
+      "href",
+      "https://unpkg.com/tabulator-tables/dist/css/tabulator_site_dark.min.css"
+    );
+    $("html").removeClass("light").addClass("dark");
+    $("#toggle-theme").html('<i class="fas fa-moon"></i>');
+  }
+  localStorage.setItem("theme", theme);
+}
+
+function toggleTheme() {
+  if ($("html").hasClass("dark")) {
+    setTheme("light");
+  } else {
+    setTheme("dark");
+  }
+}
+
+function toggleClientList() {
+  var clientList = $("#client-list");
+
+  if (clientList.hasClass("show")) {
+    clientList.removeClass("show");
+    return;
+  }
+
+  clientList.empty();
+
+  $.each(connectedClients, function (id, client) {
+    if (!client.shown) return;
+
+    const dropdownIcon = $("<i>")
+      .addClass("fas fa-chevron-down")
+      .css("margin-left", "0.5rem");
+
+    const clientDiv = $("<div>").addClass("client").text(client.ifc_file);
+
+    clientDiv.append(dropdownIcon);
+
+    const clientDetailsDiv = $("<div>").addClass("client-details");
+
+    if (id) {
+      const clientId = $("<div>")
+        .addClass("client-detail")
+        .text(`Blender ID: ${id}`);
+      clientDetailsDiv.append(clientId);
+    }
+
+    if (client.headers && client.headers.length) {
+      const clientHeaders = $("<div>")
+        .addClass("client-detail")
+        .text(`Table Headers: ${client.headers.join(", ")}`);
+
+      const scrollButton = $("<button>")
+        .addClass("scroll-button")
+        .text("Scroll to Table")
+        .on("click", function () {
+          $("html, body").animate(
+            {
+              scrollTop: $("#table-" + id).offset().top,
+            },
+            600
+          );
+          clientList.removeClass("show");
+        });
+
+      clientDetailsDiv.append(clientHeaders);
+      clientDetailsDiv.append(scrollButton);
+    }
+
+    clientDiv.append(clientDetailsDiv);
+
+    clientDiv.on("click", function () {
+      clientDetailsDiv.toggleClass("show");
+    });
+
+    clientList.append(clientDiv);
+  });
+  clientList.addClass("show");
+}

src/blenderbim/blenderbim/bim/data/webui/templates/drawings.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="en" class="dark">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Web Client</title>
+    <link
+      rel="stylesheet"
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"
+    />
+    <link rel="stylesheet" href="/static/css/drawings.css" />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
+    />
+    <script
+      type="text/javascript"
+      src="https://code.jquery.com/jquery-3.6.0.min.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://cdnjs.cloudflare.com/ajax/libs/svg.js/3.1.1/svg.min.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://cdn.socket.io/4.0.0/socket.io.min.js"
+    ></script>
+    <script>
+      var SOCKET_PORT = {{port}};
+    </script>
+    <script defer src="./static/js/drawings.js"></script>
+  </head>
+  <body>
+    <nav>
+      <img
+        src="https://blenderbim.org/assets/images/blender/blender-logo.png"
+        alt="Logo"
+        class="logo"
+      />
+      <ul>
+        <li><a href="/">IFC Data</a></li>
+        <li><a href="/gantt">Gantt Chart</a></li>
+        <li><a href="/drawings" class="active">Drawings</a></li>
+      </ul>
+      <button id="toggle-theme" onclick="toggleTheme()">
+        <i class="fas fa-moon"></i>
+      </button>
+    </nav>
+    <div id="connected-list-div">
+      <button id="show-connected-button" onclick="toggleClientList()">
+        Connected Blenders:
+        <span id="blender-count">0</span>
+        <i class="fas fa-chevron-down"></i>
+      </button>
+      <div id="client-list"></div>
+    </div>
+    <div class="container-fluid d-flex" id="container">
+      <div class="col-2 left">
+        <!-- Dropdown menu -->
+        <div class="dropdown mb-3">
+          <label for="dropdown-menu">IFC File:</label>
+          <select class="p-0 pl-2" id="dropdown-menu">
+            <!-- IFC files will be dynamically populated here -->
+            <option value="" selected disabled hidden>IFC File</option>
+          </select>
+        </div>
+        <!-- Panel with sub-panels -->
+        <div class="panel">
+          <div id="accordion">
+            <div class="card pb-2">
+              <div class="card-header overflow-hidden" id="headingOne">
+                <button
+                  class="btn p-0 w-100 text-left"
+                  data-toggle="collapse"
+                  data-target="#collapseOne"
+                >
+                  Drawings
+                </button>
+              </div>
+
+              <div id="collapseOne" class="collapse show">
+                <div class="card-body">
+                  <ul class="sub-panel pl-2" id="drawings-sub-panel">
+                    <!-- Drawings will be dynamically populated here -->
+                  </ul>
+                </div>
+              </div>
+            </div>
+            <div class="card pb-2">
+              <div class="card-header overflow-hidden" id="headingTwo">
+                <button
+                  class="btn p-0 w-100 text-left"
+                  data-toggle="collapse"
+                  data-target="#collapseTwo"
+                >
+                  Sheets
+                </button>
+              </div>
+              <div id="collapseTwo" class="collapse show">
+                <div class="card-body">
+                  <ul class="sub-panel pl-2" id="sheets-sub-panel">
+                    <!-- Sheets will be dynamically populated here -->
+                  </ul>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-10 right pl-3">
+        <div id="svg-container"></div>
+      </div>
+    </div>
+  </body>
+</html>

src/blenderbim/blenderbim/bim/data/webui/templates/gantt.html

@@ -1,11 +1,15 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="dark">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Web Client</title>
     <link rel="stylesheet" type="text/css" href="/jsgantt/jsgantt.css" />
     <link rel="stylesheet" href="/static/css/gantt.css" />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
+    />
     <script
       type="text/javascript"
       src="https://code.jquery.com/jquery-3.6.0.min.js"
@@ -22,13 +26,31 @@
   </head>
   <body>
     <nav class="no-print">
-      <img src="https://blenderbim.org/assets/images/blender/blender-logo.png" alt="Logo" class="logo" />
+      <img
+        src="https://blenderbim.org/assets/images/blender/blender-logo.png"
+        alt="Logo"
+        class="logo"
+      />
       <ul>
         <li><a href="/">IFC Data</a></li>
         <li><a href="/gantt" class="active">Gantt Chart</a></li>
+        <li><a href="/drawings">Drawings</a></li>
       </ul>
-      <div class="bottom-bar"></div>
+      <button id="toggle-theme" onclick="toggleTheme()">
+        <i class="fas fa-moon"></i>
+      </button>
     </nav>
+    <div id="connected-list-div">
+      <button id="show-connected-button" onclick="toggleClientList()">
+        Connected Blenders:
+        <span id="blender-count">0</span>
+        <i class="fas fa-chevron-down"></i>
+      </button>
+      <div id="client-list"></div>
+    </div>
     <div id="container"></div>
+    <footer>
+      <p>BlenderBIM Version: {{version}}</p>
+    </footer>
   </body>
 </html>

src/blenderbim/blenderbim/bim/data/webui/templates/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="dark">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -7,8 +7,13 @@
     <link rel="stylesheet" href="/static/css/index.css" />
     <link
       rel="stylesheet"
+      id="tabulator-stylesheet"
       href="https://unpkg.com/tabulator-tables/dist/css/tabulator_site_dark.min.css"
     />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
+    />
     <script
       type="text/javascript"
       src="https://code.jquery.com/jquery-3.6.0.min.js"
@@ -28,13 +33,31 @@
   </head>
   <body>
     <nav>
-      <img src="https://blenderbim.org/assets/images/blender/blender-logo.png" alt="Logo" class="logo" />
+      <img
+        src="https://blenderbim.org/assets/images/blender/blender-logo.png"
+        alt="Logo"
+        class="logo"
+      />
       <ul>
         <li><a href="/" class="active">IFC Data</a></li>
         <li><a href="/gantt">Gantt Chart</a></li>
+        <li><a href="/drawings">Drawings</a></li>
       </ul>
-      <div class="bottom-bar"></div>
+      <button id="toggle-theme" onclick="toggleTheme()">
+        <i class="fas fa-moon"></i>
+      </button>
     </nav>
+    <div id="connected-list-div">
+      <button id="show-connected-button" onclick="toggleClientList()">
+        Connected Blenders:
+        <span id="blender-count">0</span>
+        <i class="fas fa-chevron-down"></i>
+      </button>
+      <div id="client-list"></div>
+    </div>
     <div id="container"></div>
+    <footer>
+      <p>BlenderBIM Version: {{version}}</p>
+    </footer>
   </body>
 </html>

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -24,17 +24,16 @@ import numpy as np
 import datetime
 import zipfile
 import tempfile
-import addon_utils
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
 import ifcopenshell.util.unit
-from .. import tool
-from ..core import geometry as core_geometry
-from ..core import aggregate as core_aggregate
-from ..core import spatial as core_spatial
-from ..core import style as core_style
-from .ifc import IfcStore
+import blenderbim.tool as tool
+import blenderbim.core.geometry
+import blenderbim.core.aggregate
+import blenderbim.core.spatial
+import blenderbim.core.style
+from blenderbim.bim.ifc import IfcStore
 from mathutils import Vector
 from typing import Union
 from logging import Logger
@@ -152,7 +151,7 @@ class IfcExporter:
             return self.sync_grid_axis_object_placement(obj, element)
         if not hasattr(element, "ObjectPlacement"):
             return
-        core_geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+        blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
         return element
 
     def sync_grid_axis_object_placement(self, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
@@ -167,21 +166,6 @@ class IfcExporter:
     def get_application_name(self) -> str:
         return "BlenderBIM"
 
-    def get_application_version(self) -> str:
-        version = ".".join(
-            [
-                str(x)
-                for x in [
-                    addon.bl_info.get("version", (-1, -1, -1))
-                    for addon in addon_utils.modules()
-                    if addon.bl_info["name"] == "BlenderBIM"
-                ][0]
-            ]
-        )
-        if commit_hash := tool.Blender.get_last_commit_hash():
-            version += f"-{commit_hash}"
-        return version
-
 
 class IfcExportSettings:
     def __init__(self):

src/blenderbim/blenderbim/bim/handler.py

@@ -18,19 +18,18 @@
 
 import os
 import bpy
-import json
-import addon_utils
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
+import ifcopenshell.util.unit
 import ifcopenshell.api.owner.settings
-from .. import bim
-from .. import tool
-from ..core import owner as core_owner
+import blenderbim.bim
+import blenderbim.tool as tool
+import blenderbim.core.owner as core_owner
 from bpy.app.handlers import persistent
-from .ifc import IfcStore
-from .module.owner.prop import get_user_person, get_user_organisation
-from .module.model.data import AuthoringData
-from .module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
+from blenderbim.bim.module.model.data import AuthoringData
+from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
 from mathutils import Vector
 from math import cos, degrees
 from typing import Union
@@ -170,7 +169,12 @@ def subscribe_to(obj, data_path, callback):
 
 
 def refresh_ui_data():
-    from . import modules
+    """Refresh cached UI data.
+
+    Note that calling non-ifc-operators by itself doesn't refresh the UI data
+    and it need to be refreshed manually if needed.
+    """
+    from blenderbim.bim import modules
 
     for name, value in modules.items():
         try:
@@ -222,7 +226,7 @@ def redo_post(scene):
 
 def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
     # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
-    version = get_application_version()
+    version = tool.Blender.get_blenderbim_version()
     for element in ifc.by_type("IfcApplication"):
         if element.ApplicationIdentifier == "BlenderBIM" and element.Version == version:
             return element
@@ -248,19 +252,6 @@ def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None
         return pao
 
 
-def get_application_version() -> str:
-    return ".".join(
-        [
-            str(x)
-            for x in [
-                addon.bl_info.get("version", (-1, -1, -1))
-                for addon in addon_utils.modules()
-                if addon.bl_info["name"] == "BlenderBIM"
-            ][0]
-        ]
-    )
-
-
 def viewport_shading_changed_callback(area):
     shading = area.spaces.active.shading.type
     if shading == "RENDERED":
@@ -308,7 +299,10 @@ def load_post(scene):
     # tab. We override default scene properties panels with our own poll
     # to hide them unless the user has chosen to view Blender properties.
     for panel in tool.Blender.get_scene_panels_list():
-        if panel in bim.original_scene_panels_polls:
+        if panel in blenderbim.bim.original_scene_panels_polls:
             continue
         tool.Blender.override_scene_panel(panel)
     tool.Blender.setup_tabs()
+
+    if tool.Ifc.get() and bpy.data.is_saved:
+        bpy.context.scene.BIMProperties.has_blend_warning = True

src/blenderbim/blenderbim/bim/helper.py

@@ -23,11 +23,12 @@ import math
 import ifcopenshell
 import ifcopenshell.util.attribute
 import ifcopenshell.util.element
+import ifcopenshell.util.unit
 from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
 from mathutils import geometry
 from mathutils import Vector
-from .. import tool
-from .ifc import IfcStore
+import blenderbim.tool as tool
+from blenderbim.bim.ifc import IfcStore
 from typing import Optional, Callable, Any, Union
 
 
@@ -50,6 +51,8 @@ def draw_attribute(attribute, layout, copy_operator=None):
         return
     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 attribute.name in ["ScheduleDuration", "ActualDuration", "FreeFloat", "TotalFloat"]:
         propis = bpy.context.scene.BIMWorkScheduleProperties
         for item in propis.durations_attributes:

src/blenderbim/blenderbim/bim/ifc.py

@@ -24,18 +24,17 @@ import hashlib
 import zipfile
 import tempfile
 import traceback
-import importlib
 import ifcopenshell
 import ifcopenshell.geom
 import ifcopenshell.ifcopenshell_wrapper
-from . import handler as bim_handler
-from .. import tool
+import blenderbim
+import blenderbim.bim.handler
+import blenderbim.tool as tool
 from pathlib import Path
-from ..tool.brick import BrickStore
+from blenderbim.tool.brick import BrickStore
 from typing import Set, Union, Optional, TypedDict, Callable
 
 
-bbim = importlib.import_module("..", package=__package__)
 IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]
 
 
@@ -253,11 +252,11 @@ class IfcStore:
         else:
             obj.BIMObjectProperties.ifc_definition_id = element.id()
 
-        bim_handler.subscribe_to(obj, "name", bim_handler.name_callback)
+        blenderbim.bim.handler.subscribe_to(obj, "name", blenderbim.bim.handler.name_callback)
 
         if isinstance(obj, bpy.types.Object):
-            bim_handler.subscribe_to(
-                obj, "active_material_index", bim_handler.active_material_index_callback
+            blenderbim.bim.handler.subscribe_to(
+                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
             )
 
         if IfcStore.history:
@@ -280,10 +279,10 @@ class IfcStore:
         IfcStore.id_map[data["id"]] = obj
         if "guid" in data:
             IfcStore.guid_map[data["guid"]] = obj
-        bim_handler.subscribe_to(obj, "name", bim_handler.name_callback)
+        blenderbim.bim.handler.subscribe_to(obj, "name", blenderbim.bim.handler.name_callback)
         if isinstance(obj, bpy.types.Object):
-            bim_handler.subscribe_to(
-                obj, "active_material_index", bim_handler.active_material_index_callback
+            blenderbim.bim.handler.subscribe_to(
+                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
             )
         # TODO Listeners are not re-registered. Does this cause nasty problems to debug later on?
         # TODO We're handling id_map and guid_map, but what about edited_objs? This might cause big problems.
@@ -365,7 +364,7 @@ class IfcStore:
 
     @staticmethod
     def execute_ifc_operator(operator: bpy.types.Operator, context: bpy.types.Context, is_invoke=False):
-        bbim.last_actions.append({"type": "operator", "name": operator.bl_idname})
+        blenderbim.last_actions.append({"type": "operator", "name": operator.bl_idname})
         bpy.context.scene.BIMProperties.is_dirty = True
         is_top_level_operator = not bool(IfcStore.current_transaction)
 
@@ -386,7 +385,7 @@ class IfcStore:
             else:
                 result = getattr(operator, "_execute")(context)
         except:
-            bbim.last_error = traceback.format_exc()
+            blenderbim.last_error = traceback.format_exc()
             raise
 
         if is_top_level_operator:
@@ -398,7 +397,7 @@ class IfcStore:
             if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
                 BrickStore.end_transaction()
             IfcStore.end_transaction(operator)
-            bim_handler.refresh_ui_data()
+            blenderbim.bim.handler.refresh_ui_data()
 
         return result
 

src/blenderbim/blenderbim/bim/import_ifc.py

@@ -32,10 +32,10 @@ import ifcopenshell.util.geolocation
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import ifcopenshell.util.shape
-from .. import tool
+import blenderbim.tool as tool
 from itertools import chain, accumulate
-from .ifc import IfcStore, IFC_CONNECTED_TYPE
-from ..tool.loader import OBJECT_DATA_TYPE
+from blenderbim.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
+from blenderbim.tool.loader import OBJECT_DATA_TYPE
 from typing import Dict, Union, Optional, Any
 
 
@@ -551,7 +551,7 @@ class IfcImporter:
         for axis in axes:
             shape = tool.Loader.create_generic_shape(axis.AxisCurve)
             mesh = self.create_mesh(axis, shape)
-            obj = bpy.data.objects.new(f"IfcGridAxis/{axis.AxisTag}", mesh)
+            obj = bpy.data.objects.new(tool.Loader.get_name(axis), mesh)
             if tool.Blender.get_addon_preferences().lock_grids_on_import:
                 obj.lock_location = (True, True, True)
                 obj.lock_rotation = (True, True, True)
@@ -781,7 +781,7 @@ class IfcImporter:
             mesh = bpy.data.meshes.new(mesh_name)
             mesh.from_pydata([mathutils.Vector(vertex) * self.unit_scale], [], [])
 
-            obj = bpy.data.objects.new("{}/{}".format(product.is_a(), product.Name), mesh)
+            obj = bpy.data.objects.new(tool.Loader.get_name(product), mesh)
             self.set_matrix_world(obj, tool.Loader.apply_blender_offset_to_matrix_world(obj, placement_matrix))
             self.link_element(product, obj)
 
@@ -847,7 +847,7 @@ class IfcImporter:
         mesh.from_pydata(vertex_list, [], [])
         tool.Ifc.link(representation, mesh)
 
-        obj = bpy.data.objects.new("{}/{}".format(product.is_a(), product.Name), mesh)
+        obj = bpy.data.objects.new(tool.Loader.get_name(product), mesh)
         self.set_matrix_world(obj, tool.Loader.apply_blender_offset_to_matrix_world(obj, placement_matrix))
         self.link_element(product, obj)
         return product
@@ -1261,7 +1261,7 @@ class IfcImporter:
     def place_objects_in_collections(self) -> None:
         for ifc_definition_id, obj in self.added_data.items():
             if isinstance(obj, bpy.types.Object):
-                tool.Collector.assign(obj)
+                tool.Collector.assign(obj, should_clean_users_collection=False)
 
     def is_curve_annotation(self, element: ifcopenshell.entity_instance) -> bool:
         object_type = element.ObjectType

src/blenderbim/blenderbim/bim/module/aggregate/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from .... import tool
+import blenderbim.tool as tool
 import ifcopenshell.util.element
 
 
@@ -75,7 +75,7 @@ class AggregateData:
             return []
         if not element:
             return []
-        
+
         product_linked_agg_group = [
             r
             for r in getattr(aggregate, "HasAssignments", []) or []
@@ -85,7 +85,6 @@ class AggregateData:
 
         if not product_linked_agg_group:
             return []
-        
+
         total = len(product_linked_agg_group[0].RelatedObjects)
         return total
-        

src/blenderbim/blenderbim/bim/module/aggregate/operator.py

@@ -18,12 +18,13 @@
 
 import bpy
 import ifcopenshell
+import ifcopenshell.api
 import ifcopenshell.util.element
-from .... import tool
-from ....core import aggregate as core
-from ....core import spatial as core_spatial
-from ... import handler as bim_handler
-from ...ifc import IfcStore
+import blenderbim.tool as tool
+import blenderbim.core.aggregate as core
+import blenderbim.core.spatial
+import blenderbim.bim.handler
+from blenderbim.bim.ifc import IfcStore
 
 
 class BIM_OT_aggregate_assign_object(bpy.types.Operator, tool.Ifc.Operator):
@@ -163,11 +164,11 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
                     related_obj=aggregate,
                 )
             elif current_container:
-                core_spatial.assign_container(
+                blenderbim.core.spatial.assign_container(
                     tool.Ifc,
                     tool.Collector,
                     tool.Spatial,
-                    structure_obj=tool.Ifc.get_object(current_container),
+                    container=current_container,
                     element_obj=aggregate,
                 )
             core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
@@ -283,7 +284,7 @@ class BIM_OT_add_part_to_object(bpy.types.Operator, tool.Ifc.Operator):
             part_class=self.part_class,
             part_name=self.part_name,
         )
-        core_spatial.import_spatial_decomposition(tool.Spatial)
+        blenderbim.core.spatial.import_spatial_decomposition(tool.Spatial)
 
 
 class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, tool.Ifc.Operator):
@@ -304,7 +305,7 @@ 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 = tool.Ifc.get().by_id(pset["id"])
-            ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
+            ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=part, pset=pset)
 
         linked_aggregate_group = [
             r.RelatingGroup

src/blenderbim/blenderbim/bim/module/aggregate/prop.py

@@ -17,8 +17,8 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from ...prop import StrProperty, Attribute
-from ..spatial.data import SpatialData
+from blenderbim.bim.prop import StrProperty, Attribute
+from blenderbim.bim.module.spatial.data import SpatialData
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,

src/blenderbim/blenderbim/bim/module/aggregate/ui.py

@@ -17,10 +17,10 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 from bpy.types import Panel
-from .data import AggregateData
-from ..group.data import GroupsData, ObjectGroupsData
-from ...ifc import IfcStore
-from .... import tool
+from blenderbim.bim.module.aggregate.data import AggregateData
+from blenderbim.bim.module.group.data import GroupsData, ObjectGroupsData
+from blenderbim.bim.ifc import IfcStore
+import blenderbim.tool as tool
 
 
 class BIM_PT_aggregate(Panel):
@@ -99,7 +99,7 @@ class BIM_PT_aggregate(Panel):
             op = row.operator("bim.select_parts", icon="RESTRICT_SELECT_OFF", text="")
             op.obj = context.active_object.name
 
-            
+
 class BIM_PT_linked_aggregate(Panel):
     bl_label = "Linked Aggregates"
     bl_idname = "BIM_PT_linked_aggregate"
@@ -133,9 +133,8 @@ class BIM_PT_linked_aggregate(Panel):
         props = obj.BIMObjectAggregateProperties
         row = layout.row(align=True)
 
-
         if element.Decomposes:
-            Number_Linked_Aggregates = AggregateData.data['total_linked_aggregate']
+            Number_Linked_Aggregates = AggregateData.data["total_linked_aggregate"]
             if not Number_Linked_Aggregates:
                 row.label(text="Not a Linked Aggregate")
             else:
@@ -151,6 +150,3 @@ class BIM_PT_linked_aggregate(Panel):
                     op = row.operator("bim.break_link_to_other_aggregates", text="", icon="X")
         else:
             row.label(text="Not an Aggregate")
-            
-        
-

src/blenderbim/blenderbim/bim/module/attribute/data.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell
-from .... import tool
+import blenderbim.tool as tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/attribute/operator.py

@@ -21,11 +21,12 @@ import json
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.guid
-from ... import helper as bim_helper
-from ... import handler as bim_handler
-from .... import tool
-from ....core import attribute as core
-from ...ifc import IfcStore
+import ifcopenshell.util.element
+import blenderbim.bim.helper
+import blenderbim.bim.handler
+import blenderbim.tool as tool
+import blenderbim.core.attribute as core
+from blenderbim.bim.ifc import IfcStore
 
 
 class EnableEditingAttributes(bpy.types.Operator):
@@ -36,7 +37,7 @@ class EnableEditingAttributes(bpy.types.Operator):
 
     def execute(self, context):
         self.file = IfcStore.get_file()
-        obj = bpy.data.objects.get(self.obj)
+        obj = bpy.data.objects[self.obj]
         props = obj.BIMAttributeProperties
         props.attributes.clear()
 
@@ -58,13 +59,13 @@ class EnableEditingAttributes(bpy.types.Operator):
                 new.data_type = "string"
                 new.ifc_class = data["type"]
                 new.string_value = "" if new.is_null else json.dumps(data[name])
-                bim_helper.add_attribute_description(new)
+                blenderbim.bim.helper.add_attribute_description(new)
                 new.description += " The degrees, minutes and seconds should follow this format : [12,34,56]"
             if name in ("PredefinedType", "ObjectType") and has_inherited_predefined_type:
                 props.attributes.remove(len(props.attributes) - 1)
                 return True
 
-        bim_helper.import_attributes2(element, props.attributes, callback=callback)
+        blenderbim.bim.helper.import_attributes2(element, props.attributes, callback=callback)
         props.is_editing_attributes = True
         return {"FINISHED"}
 
@@ -105,7 +106,7 @@ class EditAttributes(bpy.types.Operator, tool.Ifc.Operator):
                         attributes[prop.name] = None
                 return True
 
-        attributes = bim_helper.export_attributes(props.attributes, callback=callback)
+        attributes = blenderbim.bim.helper.export_attributes(props.attributes, callback=callback)
         ifcopenshell.api.run("attribute.edit_attributes", self.file, product=product, attributes=attributes)
         bpy.ops.bim.disable_editing_attributes(obj=obj.name)
         return {"FINISHED"}

src/blenderbim/blenderbim/bim/module/attribute/prop.py

@@ -17,8 +17,8 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from ...ifc import IfcStore
-from ...prop import StrProperty, Attribute
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,

src/blenderbim/blenderbim/bim/module/attribute/ui.py

@@ -16,10 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-from ... import helper as bim_helper
+import blenderbim.bim.helper
 from bpy.types import Panel
-from ...ifc import IfcStore
-from .data import AttributesData
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.attribute.data import AttributesData
 
 
 def draw_ui(context, layout, attributes):
@@ -34,7 +34,7 @@ def draw_ui(context, layout, attributes):
         op = row.operator("bim.disable_editing_attributes", icon="CANCEL", text="")
         op.obj = obj.name
 
-        bim_helper.draw_attributes(props.attributes, layout, copy_operator="bim.copy_attribute_to_selection")
+        blenderbim.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")
@@ -45,8 +45,7 @@ def draw_ui(context, layout, attributes):
             row.label(text=attribute["name"])
             # row.label(text=attribute["value"])
             op = row.operator("bim.select_similar", text=attribute["value"], icon="NONE", emboss=False)
-            op.key = attribute['name']
-            
+            op.key = attribute["name"]
 
     # TODO: reimplement, see #1222
     # if "IfcSite/" in context.active_object.name or "IfcBuilding/" in context.active_object.name:

src/blenderbim/blenderbim/bim/module/augin/operator.py

@@ -18,14 +18,13 @@
 
 import os
 import bpy
-import json
 import string
 import random
 import shutil
 import requests
 import tempfile
 import datetime
-import addon_utils
+import blenderbim.tool as tool
 
 
 class AuginLogin(bpy.types.Operator):
@@ -77,16 +76,7 @@ class AuginCreateNewModel(bpy.types.Operator):
         props.project_filename = "BBM{}{}".format(
             datetime.datetime.now().strftime("%Y%m%d%H%M%S"), "".join(random.choice(chars) for _ in range(6))
         )
-        addon_version = ".".join(
-            [
-                str(x)
-                for x in [
-                    addon.bl_info.get("version", (-1, -1, -1))
-                    for addon in addon_utils.modules()
-                    if addon.bl_info["name"] == "BlenderBIM"
-                ][0]
-            ]
-        )
+        addon_version = tool.Blender.get_blenderbim_version()
 
         payload = {
             "user_token": props.token,

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

@@ -26,11 +26,12 @@ import numpy as np
 import tempfile
 import webbrowser
 import ifcopenshell
+import ifcopenshell.util.geolocation
 import ifcopenshell.util.unit
-from . import prop as bcf_prop
+import blenderbim.bim.module.bcf.prop as bcf_prop
 from . import bcfstore
 from pathlib import Path
-from ...ifc import IfcStore
+from blenderbim.bim.ifc import IfcStore
 from math import radians, degrees, atan, tan, cos, sin
 from mathutils import Vector, Matrix, Euler, geometry
 from xsdata.models.datatype import XmlDateTime
@@ -66,10 +67,7 @@ class LoadBcfProject(bpy.types.Operator):
             if bcfxml.version.version_id.startswith("2"):
                 print("No project, we will create one for BBIM.")
                 bcfxml.project_info = bcf.v2.model.ProjectExtension(
-                    project=bcf.v2.model.Project(
-                        name=nameless,
-                        project_id=str(uuid.uuid4())
-                    ), extension_schema=""
+                    project=bcf.v2.model.Project(name=nameless, project_id=str(uuid.uuid4())), extension_schema=""
                 )
         if bcfxml.project.name is None:
             bcfxml.project.name = nameless
@@ -971,13 +969,14 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         self.set_colours(viewpoint)
 
     def set_exceptions(self, viewpoint, context):
-        if (
-            not hasattr(viewpoint.visualization_info.components, "visibility")
-            or not hasattr(viewpoint.visualization_info.components.visibility.exceptions, "component")
+        if not hasattr(viewpoint.visualization_info.components, "visibility") or not hasattr(
+            viewpoint.visualization_info.components.visibility.exceptions, "component"
         ):
             return
 
-        exception_global_ids = {v.ifc_guid for v in viewpoint.visualization_info.components.visibility.exceptions.component or []}
+        exception_global_ids = {
+            v.ifc_guid for v in viewpoint.visualization_info.components.visibility.exceptions.component or []
+        }
 
         # print("default_visibility: {}".format(viewpoint.visualization_info.components.visibility.default_visibility))
         if viewpoint.visualization_info.components.visibility.default_visibility:
@@ -1034,7 +1033,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         context.area.type = old
 
     def set_openings_visibility(self, is_visible, context):
-        pass # We no longer have an openings collection
+        pass  # We no longer have an openings collection
 
     def set_selection(self, viewpoint):
         if not viewpoint.visualization_info.components or not viewpoint.visualization_info.components.selection:
@@ -1147,7 +1146,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         # https://github.com/buildingSMART/BCF-XML/tree/release_3_0/Documentation#coloring
         if lv == 8:
             t = tuple(int(value[i : i + lv // 4], 16) for i in range(0, lv, lv // 4))
-            col = [t[1] / 255.0, t[2] / 255.0, t[3] / 255.0,  t[0] / 255.0]
+            col = [t[1] / 255.0, t[2] / 255.0, t[3] / 255.0, t[0] / 255.0]
         else:
             t = tuple(int(value[i : i + lv // 3], 16) for i in range(0, lv, lv // 3))
             col = [t[0] / 255.0, t[1] / 255.0, t[2] / 255.0, 1]

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

@@ -18,7 +18,7 @@
 
 import bpy
 from . import bcfstore
-from ...prop import StrProperty
+from blenderbim.bim.prop import StrProperty
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,

src/blenderbim/blenderbim/bim/module/boundary/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from .... import tool
+import blenderbim.tool as tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/boundary/decorator.py

@@ -18,7 +18,7 @@
 
 import gpu
 import bmesh
-from .... import tool
+import blenderbim.tool as tool
 from bpy.types import SpaceView3D
 from mathutils import Vector
 from gpu_extras.batch import batch_for_shader

src/blenderbim/blenderbim/bim/module/boundary/operator.py

@@ -31,15 +31,15 @@ import ifcopenshell.util.shape
 import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
-from .... import tool
-from ... import import_ifc
+import blenderbim.tool as tool
+import blenderbim.bim.import_ifc as import_ifc
 from math import pi, inf, degrees, acos, radians
 from mathutils import Vector, Matrix
-from ...ifc import IfcStore
-from ..model.decorator import ProfileDecorator
-from .decorator import BoundaryDecorator
-from .... import core as core
-from ....core import geometry as core_geometry
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.model.decorator import ProfileDecorator
+from blenderbim.bim.module.boundary.decorator import BoundaryDecorator
+import blenderbim.core
+import blenderbim.core.geometry
 
 
 def get_boundaries_collection(blender_space):
@@ -521,7 +521,7 @@ class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
             if not element or not getattr(element, "BoundedBy", None):
                 continue
             if tool.Ifc.is_moved(obj):
-                core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+                blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
             element = tool.Ifc.get_entity(obj)
             for rel in element.BoundedBy or []:
                 boundary_obj = loader.load_boundary(rel, obj)
@@ -603,7 +603,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
 
         objs = context.selected_objects
 
-        if not any((element:=tool.Ifc.get_entity(obj)) and element.is_a("IfcSpace") for obj in objs):
+        if not any((element := tool.Ifc.get_entity(obj)) and element.is_a("IfcSpace") for obj in objs):
             self.report({"INFO"}, "No IfcSpace elements selected.")
             return {"FINISHED"}
 
@@ -1014,7 +1014,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
     def get_flattened_polygon(self, element, relating_space_obj, target_face_matrix_i):
         obj = tool.Ifc.get_object(element)
         if obj and tool.Ifc.is_moved(obj):
-            core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+            blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
 
         space_matrix_i = relating_space_obj.matrix_world.inverted()
 

src/blenderbim/blenderbim/bim/module/boundary/prop.py

@@ -18,7 +18,7 @@
 
 import bpy
 from bpy.types import PropertyGroup
-from ...prop import ObjProperty
+from blenderbim.bim.prop import ObjProperty
 from bpy.props import (
     PointerProperty,
     StringProperty,
@@ -29,7 +29,7 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-from .... import tool
+import blenderbim.tool as tool
 
 
 def space_filter(self, object):

src/blenderbim/blenderbim/bim/module/boundary/ui.py

@@ -17,11 +17,11 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from ... import helper as bim_helper
+import blenderbim.bim.helper
 from bpy.types import Panel, UIList
-from ...ifc import IfcStore
-from .... import tool
-from .data import SpaceBoundariesData
+from blenderbim.bim.ifc import IfcStore
+import blenderbim.tool as tool
+from blenderbim.bim.module.boundary.data import SpaceBoundariesData
 
 
 class BIM_PT_SceneBoundaries(Panel):

src/blenderbim/blenderbim/bim/module/brick/data.py

@@ -17,8 +17,8 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from .... import tool
-from ....tool.brick import BrickStore
+import blenderbim.tool as tool
+from blenderbim.tool.brick import BrickStore
 
 try:
     from rdflib import URIRef, BNode
@@ -166,9 +166,9 @@ class BrickschemaReferencesData:
                 results.append(
                     {
                         "id": reference.id(),
-                        "identification": reference.ItemReference
-                        if tool.Ifc.get_schema() == "IFC2X3"
-                        else reference.Identification,
+                        "identification": (
+                            reference.ItemReference if tool.Ifc.get_schema() == "IFC2X3" else reference.Identification
+                        ),
                         "name": reference.Name or "Unnamed",
                     }
                 )