Temporary hack for path tags without 'd' attr #6871 #6876

Hope I don't miss anything, but couldn't find any references to ContextTypes, ContextIdentifiers and they seem to have no effect.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,23 @@
+name: Bug Report
+description: Crashes, error messages, and broken features
+type: bug
+body:
+- type: textarea
+  attributes:
+    label: Bug Description
+    placeholder: |
+      Describe what problem occurred and what you expected to happen instead.
+  
+      1. To reproduce this, open file '...'
+      2. Click on '....'
+      3. See error
+- type: textarea
+  attributes:
+    label: Attachments
+    description: "Private files can be uploaded to https://ifcopenshell.org/upload.html - only viewed by core developers and will be deleted afterwards. Please submit your report first then upload private files afterwards."
+    placeholder: "If applicable, add screenshots to help explain your problem. Please also drag-drop any files necessary to show the error (rename the file extension from .ifc to .txt to upload)."
+- type: textarea
+  attributes:
+    label: Debug and Error Output
+    description: "If this is in Bonsai, paste the output from the Copy Debug Information option in Bonsai. It can be found under Quality and Coordination -> Quality Control -> Debug. If this is a general software issue, if relevant include details about IfcOpenShell version, operating system, Python version, etc."
+    render: yes

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Forums
+    url: https://community.osarch.org/
+    about: Have a question? Want to discuss an idea? Try the OSArch forums instead.
+  - name: Live Chat
+    url: https://osarch.org/chat
+    about: Have a really confusing issue? Want real-time support?

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,8 @@
+name: Feature Request
+description: Suggest a new feature or improvement
+type: Feature
+body:
+- type: textarea
+  attributes:
+    label: Feature Description
+    placeholder: "Describe a feature you'd like us to add, or a change to the user interface, design, or workflow for usability. If it's not obvious, explain why this feature is awesome. Note that feature requests must be specific and measurable."

.github/workflows/build_all.yml

@@ -0,0 +1,21 @@
+name: Dispatch Build IfcOpenShell
+
+on:
+  workflow_dispatch:
+
+jobs:
+  trigger-workflows:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        workflow:
+          - 'Build IfcOpenShell Linux'
+          - 'Build IfcOpenShell Linux ARM'
+          - 'Build IfcOpenShell OSX'
+          - 'Build IfcOpenShell WASM / Pyodide'
+          - 'Build IfcOpenShell Windows'
+    steps:
+      - name: Trigger binary build workflows
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: ${{ matrix.workflow }}

.github/workflows/build_osx.yml

@@ -0,0 +1,126 @@
+name: Build IfcOpenShell OSX
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos
+            runner: macos-13
+            arch: x64
+            oldarch: 
+          - os: macos
+            runner: macos-14
+            arch: arm64
+            oldarch: m1
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: ${{ matrix.os }}-${{ matrix.arch }}
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+        
+      - name: Install Dependencies
+        run: |
+          brew update
+          brew install git bison autoconf automake libffi cmake findutils
+          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH
+
+      - name: Install aws cli
+        run: |
+          python -m pip install awscli
+
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}-${{ matrix.os }}
+
+      - name: Run Build Script
+        run: |
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
+          fi
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/10.9/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-macos${{ matrix.oldarch }}64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_pyodide.yml

@@ -0,0 +1,54 @@
+name: Build IfcOpenShell WASM / Pyodide
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          path: IfcOpenShell
+
+      - name: Checkout Pyodide
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          repository: pyodide/pyodide
+          ref: '0.28.0a3'
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+          path: pyodide
+
+      - name: Build
+        run: |
+          VERSION=`cat IfcOpenShell/VERSION`
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
+          echo '#!/usr/bin/bash' > script.sh
+          echo 'cd pyodide' >> script.sh
+          echo 'make' >> script.sh
+          echo 'cd ..' >> script.sh
+          echo 'mkdir -p packages/ifcopenshell' >> script.sh
+          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
+          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
+          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
+          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
+          chmod +x script.sh
+          sed -i s/--tty// pyodide/run_docker
+          pyodide/run_docker ./script.sh
+          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp313-cp313-emscripten_4_0_9_wasm32.whl
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp dist s3://ifcopenshell-builds/ --recursive --exclude "*" --include "*.whl"

.github/workflows/build_rocky.yml

@@ -0,0 +1,116 @@
+name: Build IfcOpenShell Linux
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-22.04
+    container: rockylinux:8
+
+    steps:
+      - name: Install Dependencies
+        run: |
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
+                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
+                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
+                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
+                         findutils xz
+          git config --global --add safe.directory '*'
+
+      - name: Install aws cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+          rm -rf awscliv2.zip aws
+          aws --version
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: rockylinux8-x64
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+
+      - name: Run Build Script
+        run: |
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linux64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_rocky_arm.yml

@@ -0,0 +1,116 @@
+name: Build IfcOpenShell Linux ARM
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-22.04-arm
+    container: arm64v8/rockylinux:8
+
+    steps:
+      - name: Install Dependencies
+        run: |
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
+                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
+                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
+                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
+                         findutils xz
+          git config --global --add safe.directory '*'
+
+      - name: Install aws cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+          rm -rf awscliv2.zip aws
+          aws --version
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: rockylinux8-arm64
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
+
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+
+      - name: Run Build Script
+        run: |
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/build_win.yml

@@ -0,0 +1,130 @@
+name: Build IfcOpenShell Windows
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
+        arch: ['x64']
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: _deps-vs2022-x64-installed
+          ref: windows-${{ matrix.arch }}
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Install Dependencies
+        run: |
+          choco install -y sed 7zip.install awscli
+
+      - name: Install Python
+        run: |
+          $installer = "python-${{ matrix.python }}-amd64.exe"
+          $url = "https://www.python.org/ftp/python/${{ matrix.python }}/$installer"
+          Invoke-WebRequest -Uri $url -OutFile $installer
+          Start-Process -Wait -FilePath .\$installer -ArgumentList '/quiet InstallAllUsers=0 PrependPath=0 Include_test=0 TargetDir=C:\Python\${{ matrix.python }}'
+          Remove-Item .\$installer
+
+      - name: Unpack Dependencies
+        run: |
+          cd _deps-vs2022-x64-installed
+          Get-ChildItem -Path . -Filter 'cache-*.zip' | ForEach-Object {
+            7z x $_.FullName
+          }
+
+      - name: Run Build Script
+        shell: cmd
+        run: |
+          setlocal EnableDelayedExpansion
+          SET PYTHON_VERSION=${{ matrix.python }}
+          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
+              set PY_VER_MAJOR_MINOR=%%a%%b
+          )
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          SET IFCOS_INSTALL_PYTHON=FALSE
+          cd win
+          echo y | call build-deps.cmd vs2022-x64 Release
+          SET PYTHONHOME=C:\Python\${{ matrix.python }}
+          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
+          call install-ifcopenshell.bat vs2022-x64 Release
+
+      - name: Pack Dependencies
+        run: |
+          cd _deps-vs2022-x64-installed
+          Get-ChildItem -Path . -Directory | ForEach-Object {
+            $cacheFile = "cache-$($_.Name).zip"
+            echo $cacheFile
+            if (!(Test-Path $cacheFile)) {
+              7z a $cacheFile $_.FullName
+            }
+          }
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd _deps-vs2022-x64-installed
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add *.zip
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || echo "Push failed"
+
+      - name: Package .zip Archives
+        run: |
+          $VERSION = 'v' + ((Get-Content VERSION).Trim())
+          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
+          $OUTPUT_DIR = "$env:USERPROFILE\output"
+          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
+
+          if ("${{ matrix.python }}" -eq "3.9.11") {
+            # only for the first python version the executables are assembled for upload
+            cd _installed-vs2022-x64/bin
+            Get-ChildItem -Path . | ForEach-Object {
+              echo $_
+              $exe = $_.Name
+              $baseName = $exe.Substring(0, $exe.Length - 4)
+              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
+              7z a $zipName $exe
+            }
+            mv *.zip $OUTPUT_DIR
+          }
+
+          $pyVersion = "${{ matrix.python }}"
+          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
+          cd C:\Python\${{ matrix.python }}\Lib\site-packages
+          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
+          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
+          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
+          7z a $zipName ifcopenshell
+          mv $zipName $OUTPUT_DIR
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip Archives to S3
+        env:
+          AWS_DEBUG: 1
+          AWS_RETRY_MODE: standard
+          AWS_MAX_ATTEMPTS: 3
+        run: |
+          dir "$env:USERPROFILE\output"
+          foreach ($zip in Get-ChildItem -Path "$env:USERPROFILE\output" -Filter *.zip) {
+              aws s3 cp "$($zip.FullName)" s3://ifcopenshell-builds/ --debug
+              Start-Sleep -Seconds 5
+          }

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

@@ -0,0 +1,64 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Action - checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Action - install python
+        uses: actions/setup-python@v5.3.0
+        with:
+          python-version: "3.9"
+
+      - name: Action - install python
+        uses: actions/setup-python@v5.3.0
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          uv tool install ruff
+          uv tool install black
+
+      # black doesn't catch all syntax errors, so we check them explicitly.
+      - name: Check syntax errors
+        id: syntax-errors
+        run: |
+          ERROR=0
+          python3.9 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
+          exit $ERROR
+        continue-on-error: true
+
+      - name: Black formatter
+        id: black
+        run: |
+          uvx black --diff --check .
+        continue-on-error: true
+
+      - name: Ruff check
+        id: ruff
+        run: |
+          uvx ruff check
+        continue-on-error: true
+
+      - name: Final check
+        run: |
+          ERROR=0
+          if [ "${{ steps.syntax-errors.outcome }}" != "success" ]; then
+            echo "::error::Syntax errors check failed, see 'syntax-errors' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.black.outcome }}" != "success" ]; then
+            echo "::error::Black formatting check failed, see 'black' step for the details." && ERROR=1
+          fi
+          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
+            echo "::error::Ruff check failed, see 'ruff' step for the details." && ERROR=1
+          fi
+          exit $ERROR

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

@@ -1,12 +0,0 @@
-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-bonsai-daily.yml

@@ -96,15 +96,15 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IOS_TO_BLENDER_REPO }}
+          token: ${{ secrets.IFCOPENBOT_TOKEN }}
           path: bonsai_unstable_repo
 
-      - name: Update index.json on extensions repo
+      - name: Download Blender and run critical tests
         run: |
-          set -x -e
+          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
 
           # Download Blender.
-          wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.2/blender-4.2.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender4.4/blender-4.4.0-linux-x64.tar.xz
           tar -xf blender.tar.xz
 
           # Setup Blender.
@@ -112,25 +112,25 @@ jobs:
           export PATH="$PATH:$BLENDER_PATH"
           blender --version
 
+          # Setup unstable repo to get Bonsai build.
           cd bonsai_unstable_repo
           pip install -r requirements.txt
           python setup_extensions_repo.py --last-tag
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          git add index.json
-          git add readme.md
-          git commit -m "Update index.json"
-          git push
-      - name: Run bonsai tests
-        run: |
-          set -x -e
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
+          cd ..
           bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
-          blender --version
+
+          # Install Bonsai.
           blender --command extension install-file -r user_default -e $bonsai_zip
           blender --command extension list
 
+          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
+
+          # Reregister Bonsai.
+          # Note that running it in background might miss some errors
+          # (e.g. tools are not registered in background mode).
+          blender --background --python IfcOpenShell/src/bonsai/scripts/reregister_bonsai.py
+
+          # Install sverchok.
           wget -q -O sverchok.zip https://github.com/nortikin/sverchok/archive/refs/heads/master.zip
           # ifcsverchok expecting sverchok to be named "sverchok" and not "sverchok-master".
           unzip -q sverchok.zip
@@ -139,20 +139,43 @@ jobs:
           rm -r sverchok
           blender --command extension install-file -r user_default sverchok.zip
 
-          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
+          # Install ifcsverchok.
           cd IfcOpenShell/src/ifcsverchok
           make dist
           sverchok_zip="$(pwd)/dist/$(ls dist)"
           blender --command extension install-file -r user_default $sverchok_zip
 
+      - name: Update index.json on extensions repo
+        run: |
+          set -x -e
+
+          # Setup Blender.
+          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
+          export PATH="$PATH:$BLENDER_PATH"
+          blender --version
+
+          cd bonsai_unstable_repo
+          git config --global user.name 'IfcOpenBot'
+          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          git add index.json
+          git add readme.md
+          git commit -m "Update index.json"
+          git push
+
+      - name: Run bonsai tests
+        run: |
+          set -x -e
+          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
+          export PATH="$PATH:$BLENDER_PATH"
+          blender --version
+
           # Install Sun Position extension.
           blender --online-mode --command extension sync
-          blender --online-mode --background --python-expr "import bpy; \
-          bpy.ops.extensions.package_install(repo_index=0, pkg_id='sun_position'); \
-          bpy.ops.preferences.addon_enable(module='bl_ext.blender_org.sun_position'); bpy.ops.wm.save_userpref()"
+          blender --online-mode --command extension install --enable --sync sun_position
 
-          cd ../bonsai
+          cd IfcOpenShell/src/bonsai
           pip install pytest-blender
+          pip install pytest-bdd
           blender --background --python scripts/setup_pytest.py
           blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background
           make test

.github/workflows/ci-ifcconvert.yml

@@ -24,10 +24,6 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
           - {
             name: "Linux 64bit",
             short_name: linux64

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

@@ -35,11 +35,11 @@ jobs:
 
       - name: Version + date str
         id: verdate
-        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
+        run: echo "verdate=${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}" >> $GITHUB_OUTPUT
 
       
   test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
     needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
@@ -48,57 +48,67 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [novtk, all]
         pyver: [
-#          { name: py311, distver: '3.11'},
           { name: py312, distver: '3.12'}
         ]
         platform: [
           { name: win, distver: windows-latest, pkg_dir: 'win-64' },
           { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
+          { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' },
+          { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' }
         ]
     steps:
-      - name: Set up swap space
+      - name: Set Swap Space
         if: runner.os == 'Linux'
-        uses: pierotofy/set-swap-space@v1.0
+        uses: pierotofy/set-swap-space@master
         with:
           swap-size-gb: 10
-
+      
+      - name: set ARTIFACTS ENV vars
+        shell: bash
+        run: |
+          pwd
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            echo "ARTIFACTS_DIR=D:/a/artifacts" >> $GITHUB_ENV
+          elif [[ "$RUNNER_OS" == "macOS" ]]; then
+            echo "ARTIFACTS_DIR=/Users/runner/work/artifacts" >> $GITHUB_ENV
+          elif [[ "$RUNNER_OS" == "Linux" ]]; then
+            echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
+          fi
+      
       - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Download and extract MacOSX SDK
-        if: ${{ runner.os == 'macOS' }}
+        if: ${{ matrix.platform.name == 'macOS-x86' }}
         run: |
           curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
 
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: test-env
           create-args: >-
-            python=3.11
+            python=3.12
             anaconda-client
-            boa
+            rattler-build
 
       - name: create conda package dist dir
         run: |
-          mkdir -p ${{ github.workspace }}/dist
+          mkdir -p ${{ env.ARTIFACTS_DIR }}
 
       - name: build & test ifcopenshell
         run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist' --variants='{variant: ${{ matrix.variant }}}'
-        working-directory: ./conda
+          rattler-build  build -r conda/recipe.yaml --output-dir '${{ env.ARTIFACTS_DIR }}'
         env:
           VERSION_OVERRIDE: ${{ needs.activate.outputs.verdate }}
 
       - name: upload to anaconda
         if: ${{ matrix.platform.name == 'win' }}
         run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda'
 
       - name: upload to anaconda
         if: ${{ matrix.platform.name != 'win' }}
         run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ env.ARTIFACTS_DIR }}/${{ matrix.platform.pkg_dir }}/*.conda

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

@@ -9,7 +9,7 @@ on:
 jobs:
 
   activate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
       !startsWith(github.event.head_commit.message, 'Release ') &&
@@ -18,7 +18,7 @@ jobs:
     - run: echo ok go
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: activate
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
 
     -
       name: ccache
-      uses: hendrikmuhs/ccache-action@v1
+      uses: hendrikmuhs/ccache-action@v1.2
 
     - 
       name: Build ifcopenshell
@@ -44,6 +44,7 @@ jobs:
         cmake \
          -DCMAKE_C_COMPILER_LAUNCHER=ccache \
          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_STANDARD=17 \
          -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
          -DCMAKE_BUILD_TYPE=Release \
          -DCMAKE_PREFIX_PATH=/usr \
@@ -75,7 +76,7 @@ jobs:
         make package
       working-directory: build
     - name: Upload 
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         # Artifact name
         name: ifcos-artifacts
@@ -83,7 +84,7 @@ jobs:
         path: build/assets/Ifc*
 
   deliver:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
     name: Docker Build, Tag, Push
 
@@ -118,6 +119,6 @@ jobs:
         repository: aecgeeks/ifcopenshell
         # Since the dispatch is set to `tag`, `github.ref_name` should evaluate to the pushed tag
         # On a workflow dispatch, `ref_name` will take on the value from the dispatch payload
-        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:latest' }}
+        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:22.04' }}
         file: ./Dockerfile
         push: true

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

@@ -44,6 +44,8 @@ jobs:
           }
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax

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

@@ -25,10 +25,6 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
           - {
             name: "Linux 64bit",
             short_name: linux64
@@ -43,6 +39,8 @@ jobs:
           }
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ on:
       - 'src/ifcparse/**'
       - 'src/ifcwrap/**'
       - 'src/qtviewer/**'
+      - 'src/svgfill/**'
       - 'src/serializers/**'
       - 'conda/**'
       - 'cmake/**'
@@ -23,15 +24,15 @@ on:
 
 jobs:
   activate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
       !contains(github.event.head_commit.message, 'skip ci')
     steps:
       - run: echo ok go
 
-  build:
-    runs-on: ubuntu-latest
+  compile-and-test:
+    runs-on: ubuntu-22.04
     needs: activate
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +48,6 @@ 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
 
@@ -82,6 +82,7 @@ jobs:
           cmake \
                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_STANDARD=17 \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_PREFIX_PATH=/usr \
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
@@ -126,11 +127,22 @@ jobs:
           python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test
-          cd ../bcf && make test
+          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
+          ERROR=0
+          make test || ERROR=1
+          cd ../bcf && make test || ERROR=1
           pip install requests
-          cd ../bsdd && make test
+          cd ../bsdd && make test || ERROR=1
           pip install deepdiff
-          cd ../ifcdiff && make test
-          cd ../ifcpatch && make test
-          cd ../ifctester && make test
+          cd ../ifcdiff && make test || ERROR=1
+          cd ../ifcpatch && make test || ERROR=1
+          pip install -e ../ifctester --no-deps
+          cd ../ifctester && make test || ERROR=1
+          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
+          cd ../ifcopenshell-python
+          pip install mathutils
+          make test-mathutils || ERROR=1
+          if [ $ERROR -ne 0 ]; then
+            echo "One or more tests failed";
+            exit 1;
+          fi

.github/workflows/docs-deployment-unstable.yml

@@ -0,0 +1,38 @@
+name: Build and Deploy Unstable Documentation
+
+on:
+  push:
+    branches:
+      - v0.8.0  # Trigger the workflow on pushes to the default branch which is currently v0.8.0
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs  # Navigate to the docs directory
+          pip install -r requirements.txt  # Install dependencies from requirements.txt
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs  # Navigate to the docs directory
+          make html  # Build the documentation
+
+      - name: Deploy to GitHub Pages (Unstable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}  # SSH key for deployment
+          external_repository: IfcOpenShell/bonsaibim_org_docs_unstable  # Target repository
+          publish_branch: main  # Branch to deploy to
+          cname: docs-unstable.bonsaibim.org  # Custom domain for unstable docs
+          publish_dir: src/bonsai/docs/_build/html  # Directory containing built docs

.github/workflows/docs-deployment.yml

@@ -0,0 +1,36 @@
+name: Build and Deploy Stable Documentation
+
+on:
+  workflow_dispatch:  # Manual trigger
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs
+          pip install -r requirements.txt  # Run pip install from the docs directory
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs
+          make html
+
+      - name: Deploy to GitHub Pages (Stable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          external_repository: IfcOpenShell/bonsaibim_org_docs
+          publish_branch: main
+          cname: docs.bonsaibim.org
+          publish_dir: src/bonsai/docs/_build/html

.github/workflows/publish-pyodide-demo-app.yml

@@ -0,0 +1,50 @@
+name: Deploy Pyodide Demo App to GitHub Pages
+
+permissions:
+  id-token: write
+  pages: write
+
+on:
+  push:
+    paths:
+      - 'src/pyodide/**'
+      - '.github/workflows/publish-pyodide-demo-app.yml'
+    branches:
+      - v0.8.0
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+      
+  build:
+    needs: activate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (recursive)
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: src/pyodide/demo-app/
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v[0-9].[0-9].[0-9]*'
+  workflow_dispatch:
 
 jobs:
   activate:
@@ -45,6 +46,7 @@ jobs:
           mkdir build && cd build
           cmake \
            -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
+           -DCMAKE_CXX_STANDARD=17 \
            -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_PREFIX_PATH=/usr \
            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \

.gitignore

@@ -81,11 +81,18 @@ src/bonsai/test/files/temp
 src/bonsai/test/files/basic.ifc.cache.blend
 src/bonsai/test/files/basic.ifc.cache.sqlite
 
+# bonsai data
+src/bonsai/bonsai/bim/data/build/
+src/bonsai/bonsai/bim/data/gantt/index.html
+src/bonsai/bonsai/bim/data/gantt/jsgantt.js
+src/bonsai/bonsai/bim/data/gantt/jsgantt.css
+src/bonsai/bonsai/bim/data/webui/static/js/jquery.min.js
+
 src/bonsai/drawings
 src/bonsai/layouts
 
 # ifcopenshell swig and compiled files
-src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
+src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper*.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # apple
@@ -98,3 +105,6 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # Brickschema
 src/bonsai/bonsai/bim/schema/Brick.ttl
+
+bonsaiDecoratorForLoads.code-workspace
+

.gitmodules

@@ -17,3 +17,9 @@
 [submodule "docs/cpp-api/assets/doxygen-awesome-css"]
 	path = docs/cpp-api/assets/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "src/ifcopenshell-python/ifcopenshell/simple_spf"]
+	path = src/ifcopenshell-python/ifcopenshell/simple_spf
+	url = https://github.com/IfcOpenShell/step-file-parser
+[submodule "src/pyodide/demo-app/wheels"]
+	path = src/pyodide/demo-app/wheels
+	url = https://github.com/IfcOpenShell/wasm-wheels

README.md

@@ -6,6 +6,7 @@ IfcOpenShell
 <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
 </p>
 
+
 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
 parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and [IFC4x3 Add2]. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas

VERSION

@@ -1 +1 @@
-0.8.1
+0.8.3

cmake/CMakeLists.txt

@@ -18,7 +18,12 @@
 ################################################################################
 
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 17)
+if (NOT DEFINED CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 17)
+endif()
+if (CMAKE_CXX_STANDARD LESS 17)
+    message(FATAL_ERROR "C++17 or newer is required.")
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -77,7 +82,7 @@ option(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 option(WITH_PROJ "Enable output of Earth-Centered Earth-Fixed glTF output using the PROJ library" OFF)
 option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
-option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." ON)
+option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." OFF)
 option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
 
 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
@@ -196,13 +201,25 @@ foreach(option_flag IN LISTS option_flags)
     convert_env_var_to_bool("${option_flag}")
 endforeach()
 
+set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
+
+macro(clear_wasm_sysroot)
 if(WASM_BUILD)
     # when using the nix/build-all.py build script we should not
     # look into the sysroot for most of the dependencies but rather
     # in the designated build/ folder created by the script.
-    set(CMAKE_FIND_ROOT_PATH_BACKUP "${CMAKE_FIND_ROOT_PATH}")
     set(CMAKE_FIND_ROOT_PATH "")
 endif()
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+endmacro()
+
+macro(restore_wasm_sysroot)
+if(WASM_BUILD)
+    # reset to use sysroot
+    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
+endif()
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro()
 
 if(WITH_CGAL)
     add_definitions(-DIFOPSH_WITH_CGAL)
@@ -223,7 +240,9 @@ endif()
 
 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
     UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
+    clear_wasm_sysroot()
     find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+    restore_wasm_sysroot()
     set(JSON_INCLUDE_DIR ${json_header_path})
 
     if(json_header_path)
@@ -330,13 +349,17 @@ if(USE_MMAP)
     add_definitions(-DUSE_MMAP)
 endif()
 
+clear_wasm_sysroot()
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+restore_wasm_sysroot()
 message(STATUS "Boost include files found in ${Boost_INCLUDE_DIRS}")
 message(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")
 
 if(NOT MINIMAL_BUILD)
     # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
+    clear_wasm_sysroot()
     find_package(LibXml2 REQUIRED)
+    restore_wasm_sysroot()
 endif()
 
 if(IFCXML_SUPPORT)
@@ -352,6 +375,7 @@ if(BUILD_IFCGEOM)
     # Open CASCADE
     if(WITH_OPENCASCADE)
     if("${OCC_INCLUDE_DIR}" STREQUAL "")
+	clear_wasm_sysroot()
         find_path(OCC_INCLUDE_DIR Standard_Version.hxx
             PATHS
                 /usr/include/occt
@@ -359,6 +383,7 @@ if(BUILD_IFCGEOM)
                 /usr/include/opencascade
             REQUIRED
         )
+	restore_wasm_sysroot()
 
         if(OCC_INCLUDE_DIR)
             message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
@@ -418,7 +443,9 @@ if(BUILD_IFCGEOM)
         message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
     endif()
 
+    clear_wasm_sysroot()
     find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
+    restore_wasm_sysroot()
 
     if(libTKernel)
         message(STATUS "Required Open Cascade Library files found")
@@ -641,11 +668,6 @@ if(HDF5_SUPPORT)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
 endif(HDF5_SUPPORT)
 
-if(WASM_BUILD)
-    # reset to use sysroot
-    set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH_BACKUP}")
-endif()
-
 if(ENABLE_BUILD_OPTIMIZATIONS)
     if(MSVC)
         # NOTE: RelWithDebInfo and Release use O2 (= /Ox /Gl /Gy/ = Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) by default,
@@ -925,8 +947,10 @@ endif()
 
 if(BUILD_IFCGEOM)
     if(WITH_CGAL)
+	clear_wasm_sysroot()
         find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
         find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
+	restore_wasm_sysroot()
         if(NOT libGMP)
             message(FATAL_ERROR "Unable to find GMP library files, aborting")
         endif()
@@ -1129,6 +1153,7 @@ if(ADD_COMMIT_SHA)
             message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
             execute_process(
                 COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                 OUTPUT_VARIABLE git_branches
                 OUTPUT_STRIP_TRAILING_WHITESPACE
             )
@@ -1146,11 +1171,18 @@ if(ADD_COMMIT_SHA)
 
         execute_process(
             COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             OUTPUT_VARIABLE git_sha
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
+
         message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
         message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
+
+        if ("${git_branch}" STREQUAL "" OR "${git_sha}" STREQUAL "")
+            message(FATAL_ERROR "Unable to determine commit sha and/or branch")
+        endif()
+
         add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
         add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
     endif()
@@ -1201,13 +1233,20 @@ install(TARGETS IfcParse
 )
 
 if(BUILD_IFCGEOM)
-    install(FILES ${IFCGEOM_H_FILES}
+    # install(FILES ${IFCGEOM_H_FILES}
+    #     DESTINATION ${INCLUDEDIR}/ifcgeom
+    # )
+
+    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
         DESTINATION ${INCLUDEDIR}/ifcgeom
     )
 
-    install(FILES ${SCHEMA_AGNOSTIC_H_FILES}
-        DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
-    )
+    foreach(kernel ${GEOMETRY_KERNELS})
+        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
+         install(FILES ${IFCGEOM_H_FILES}
+            DESTINATION ${INCLUDEDIR}/ifcgeom/kernels/${kernel}
+        )
+    endforeach()
 
     install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
         ARCHIVE DESTINATION ${LIBDIR}
@@ -1223,15 +1262,23 @@ if(BUILD_CONVERT)
         RUNTIME DESTINATION ${BINDIR}
     )
 
-    install(FILES ${SERIALIZERS_FILES}
+    install(FILES ${SERIALIZERS_H_FILES}
         DESTINATION ${INCLUDEDIR}/serializers/
     )
 
-    install(FILES ${SERIALIZERS_S_FILES}
+    install(FILES ${SERIALIZERS_S_H_FILES}
         DESTINATION ${INCLUDEDIR}/serializers/schema_dependent
     )
 endif(BUILD_CONVERT)
 
+if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+    install(TARGETS geometry_serializer ${geometry_serializer_libraries}
+        ARCHIVE DESTINATION ${LIBDIR}
+        LIBRARY DESTINATION ${LIBDIR}
+        RUNTIME DESTINATION ${BINDIR}
+    )
+endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
+
 # Cmake uninstall target
 if(NOT TARGET uninstall)
     configure_file(
@@ -1247,6 +1294,8 @@ endif()
 list(APPEND CPACK_SOURCE_IGNORE_FILES
     "/\\\\.git"
     "/build/"
+    "/.pytest_cache/"
+    "/__pycache__/"
 )
 set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/..;/")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}")

conda/build.bat

@@ -9,6 +9,7 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 cmake -G "Ninja" ^
  -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
+ -D CMAKE_CXX_STANDARD=17 ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -49,3 +50,7 @@ if errorlevel 1 exit 1
 ninja install -j 1
 
 if errorlevel 1 exit 1
+
+python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py
+
+if errorlevel 1 exit 1

conda/build.sh

@@ -16,6 +16,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DCMAKE_CXX_STANDARD=17 \
   ${CMAKE_PLATFORM_FLAGS[@]} \
  -DCMAKE_PREFIX_PATH=$PREFIX \
  -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
@@ -46,4 +47,6 @@ cmake ${CMAKE_ARGS} -G Ninja \
 
 ninja
 
-ninja install -j 1
+ninja install -j 1
+
+python "${RECIPE_DIR}/update_version_init.py" "${PKG_VERSION}" "${SP_DIR}/ifcopenshell/__init__.py"

conda/conda_build_config.yaml

@@ -1,6 +1,5 @@
-variant:
-  - novtk
-  - all
+python:
+  - 3.12
 
 occt:
   - 7.8.1
@@ -24,14 +23,15 @@ cxx_compiler_version:
 - '12'    # [linux]
 - '16'    # [osx]
 c_stdlib_version:
-- '2.12'    # [linux]
-- '10.13'   # [osx]
+  - 2.17    # [linux]
+  - 10.13   # [osx and x86_64]
+  - 11.0    # [osx and arm64]
 hdf5:
-- 1.14.3
+- 1.14.6
 libboost_devel:
-- '1.84'
+- '1.86'
 libxml2:
-- '2'
+- 2.13
 mpfr:
 - '4'
 gmp:
@@ -47,12 +47,12 @@ target_platform:
 - win-64    # [win]
 - linux-64  # [linux]
 - osx-64    # [osx]
-macos_machine:
-- x86_64-apple-darwin13.4.0
-MACOSX_DEPLOYMENT_TARGET:
-- '10.13'
-MACOSX_SDK_VERSION:
-- '10.13'
+macos_machine:                 # [osx]
+  - x86_64-apple-darwin13.4.0  # [osx and x86_64]
+  - arm64-apple-darwin20.0.0   # [osx and arm64]
+MACOSX_DEPLOYMENT_TARGET:      # [osx]
+  - 11.0                       # [osx and arm64]
+  - 10.13                      # [osx and x86_64]
 
-CONDA_BUILD_SYSROOT:
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx]
+CONDA_BUILD_SYSROOT:  # [osx]
+  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx and x86_64]

conda/recipe.yaml

@@ -1,64 +1,78 @@
-{% set version = environ.get('VERSION_OVERRIDE', '0.8.0') %}
-{% set build = 0 %}
-
-# Higher number -> Always prioritize "novtk" variant over "all" variant
-{% set build = build + 200 %}   # [variant == "novtk"]
-{% set build = build + 100 %}   # [variant == "all"]
+context:
+  version: ${{ env.get("VERSION_OVERRIDE", default="0.8.2.1") }}
+  build: 1
 
 package:
   name: ifcopenshell
-  version: {{ version }}
+  version: ${{ version }}
 
 source:
-  path: ../
+  - path: ..
 
 
 build:
-  number: {{ build }}
-  skip: true  # [py<39]
-  binary_relocation: false  # [osx]
-  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
-  run_exports:
-    - {{ pin_subpackage('ifcopenshell', max_pin='x.x.x') }} *{{ variant }}*
-
+  number: ${{ build }}
+  dynamic_linking:
+    binary_relocation: ${{ true if osx }}
 
 requirements:
   build:
-    - cmake
+    - if: build_platform != target_platform
+      then:
+        - python
+        - cross-python_${{ target_platform }}
+    - cmake <4
     - ninja
     - swig >=4.1.1
-    - {{ stdlib("c") }}
-    - {{ compiler('c') }}
-    - {{ compiler('cxx') }}
+    - ${{ stdlib("c") }}
+    - ${{ compiler('c') }}
+    - ${{ compiler('cxx') }}
   host:
     - python
     - libboost-devel
-    - occt *=*{{ variant }}*
+    - occt
     - libxml2
     - cgal-cpp
     - hdf5
     - eigen
     - mpfr
     - nlohmann_json
-    - gmp  # [unix]
-    - mpir  # [win]
+    - gmp
     - zlib
   run:
     - python
-    - {{ pin_compatible('occt', max_pin='x.x.x') }} *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x') }}
-
-
-test:
-  imports:
-    - ifcopenshell
+    - shapely
+    - typing_extensions
+    - ${{ pin_compatible('occt', upper_bound='x.x.x') }}
+    - ${{ pin_compatible('cgal-cpp', upper_bound='x.x') }}
+  run_exports:
+    - ${{ pin_subpackage('ifcopenshell', upper_bound='x.x.x') }}
 
+tests:
+  - python:
+      imports:
+        - ifcopenshell
+      pip_check: false
+  - script:
+      - python -c "import ifcopenshell; assert ifcopenshell.version == '${{ version }}', 'print(ifcopenshell.version)'"
+    requirements:
+      run:
+        - occt * *novtk*  # Ensure that even though compiled against OCCT with VTK, it can still run with OCCT without VTK
+        - pytest
+        - python-dateutil
+        - xmlschema
+        - xsdata
+        - lxml
+        - isodate
+        - lark
+        - networkx
+        - tabulate
+        - shapely
 
 about:
-  home: https://ifcopenshell.org
   license: LGPL-3.0-or-later
   license_file: COPYING
-  summary: 'IfcOpenShell is a library to support the IFC file format'
+  summary: IfcOpenShell is a library to support the IFC file format
   description: |
     IfcOpenShell
     ============
@@ -293,8 +307,9 @@ about:
     [MSYS2]: https://msys2.github.io/ "MSYS2"
     [win/readme.md]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/win/readme.md "win/readme.md"
     [nix/build-all.py]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/nix/build-all.py "nix/build-all.py"
-  doc_url: https://ifcopenshell.org/
-  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
+  homepage: https://ifcopenshell.org
+  repository: https://github.com/IfcOpenShell/IfcOpenShell
+  documentation: https://ifcopenshell.org/
 
 extra:
   recipe-maintainers:

conda/update_version_init.py

@@ -0,0 +1,32 @@
+import re
+import argparse
+from pathlib import Path
+
+def update_version(file_path: str, version: str) -> None:
+    """Update the version string in the given __init__.py file."""
+    file_path = Path(file_path)
+
+    # Read the file and replace the version
+    file_contents = file_path.read_text(encoding="utf-8")
+    new_contents = re.sub(r'version = "0\.0\.0"', f'version = "{version}"', file_contents)
+
+    # Write the updated contents back to the file
+    file_path.write_text(new_contents, encoding="utf-8")
+
+    print(f"Updated version in {file_path} to {version}")
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Update the version string in a Python file.")
+    parser.add_argument(
+        "version",
+        type=str,
+        help="The version string to replace '0.0.0' with (e.g., '1.2.3')."
+    )
+    parser.add_argument(
+        "file",
+        type=str,
+        help="The path to the __init__.py file where the version will be updated."
+    )
+
+    args = parser.parse_args()
+    update_version(args.file, args.version)

nix/build-all.py

@@ -48,6 +48,10 @@
 #     on OS X El Capitan with homebrew:                                       #
 #          $ brew install git bison autoconf automake libffi cmake            #
 #                                                                             #
+#     on RHEL-related distros:                                                #
+#          $ yum install git gcc gcc-c++ autoconf bison make cmake            #
+#            mesa-libGL-devel libffi-devel fontconfig-devel bzip2             #
+#            automake patch                                                   #
 ###############################################################################
 import logging
 import os
@@ -65,6 +69,7 @@ import sysconfig
 import ssl
 ssl._create_default_https_context = ssl._create_unverified_context
 
+import time
 from urllib.request import urlretrieve
 
 
@@ -78,20 +83,20 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1"]
+PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1", "3.13.0"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.8.1"
-BOOST_VERSION = "1.80.0"
+BOOST_VERSION = "1.86.0"
 PCRE_VERSION = "8.41"
-LIBXML2_VERSION = "2.9.11"
+LIBXML2_VERSION = "2.13.8"
 SWIG_VERSION = "4.0.2"
 OPENCOLLADA_VERSION = "v1.6.68"
 HDF5_VERSION = "1.12.1"
 
 GMP_VERSION = "6.2.1"
 MPFR_VERSION = "3.1.6" # latest is 4.1.0
-CGAL_VERSION = "5.3"
+CGAL_VERSION = "5.6.x-branch"
 USD_VERSION = "23.05"
 TBB_VERSION = "2021.9.0"
 
@@ -303,7 +308,7 @@ if platform.system() == "Darwin":
 BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")
 
 OCE_LOCATION = f"https://github.com/tpaviot/oce/archive/OCE-{OCE_VERSION}.tar.gz"
-BOOST_LOCATION = f"https://boostorg.jfrog.io/artifactory/main/release/{BOOST_VERSION}/source/"
+BOOST_LOCATION = f"https://github.com/boostorg/boost/releases/download/boost-{BOOST_VERSION}/"
 
 # Helper functions
 
@@ -319,7 +324,7 @@ def run_autoconf(arg1, configure_args, cwd):
     if "wasm" in flags:
         wasm.append("emconfigure")
 
-    run([*wasm, "/bin/sh", "../configure"] + configure_args + [f"--prefix={prefix}"], cwd=cwd)
+    run([*wasm, "/bin/sh", "../configure", *(["--host=wasm32"] if "wasm" in flags and not any(s.startswith('--host') for s in configure_args) else []), *configure_args, f"--prefix={prefix}"], cwd=cwd)
 
 
 def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
@@ -332,7 +337,7 @@ def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
     if "wasm" in flags:
         wasm.append("emcmake")
         
-    run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}", f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}"], cwd=cwd)
+    run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}", f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}", f"-DCMAKE_CXX_FLAGS='{os.environ['CXXFLAGS']}'", f"-DCMAKE_C_FLAGS='{os.environ['CFLAGS']}'", f"-DCMAKE_SHARED_LINKER_FLAGS={os.environ['LDFLAGS']}"], cwd=cwd)
 
 
 def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
@@ -346,6 +351,7 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
         run([git, "clone", "--recursive", clone_url, target_dir])
     else:
         logger.info(f"directory '{target_dir}' already cloned. Pulling latest changes.")
+        run([git, "-C", target_dir, "fetch", "--all", "--tags", "--force"])
 
     # detect whether we are on a branch and pull
     if run([git, "rev-parse", "--abbrev-ref", "HEAD"], cwd=target_dir) != "HEAD":
@@ -357,7 +363,7 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
         run([git, "checkout", revision], cwd=target_dir)
 
 
-def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False, **kwargs):
+def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, shell=None, pre_compile_subs=[], additional_files={}, no_append_name=False, **kwargs):
     """Handles building of dependencies with different tools (which are
     distinguished with the `mode` argument. `build_tool_args` is expected to be
     a list which is necessary in order to not mess up quoting of compiler and
@@ -380,7 +386,14 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
             
         download_path = os.path.join(build_dir, download_name)
         if not os.path.exists(download_path):
-            urlretrieve(url, os.path.join(build_dir, download_path))
+            for _ in range(3):
+                try:
+                    urlretrieve(url, os.path.join(build_dir, download_path))
+                    break
+                except ConnectionError as e:
+                    print(e, "... retrying...")
+                    time.sleep(30.)
+                    continue
         else:
             logger.info(f"Download '{download_path}' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping")
     elif download_tool == download_tool_git:
@@ -399,6 +412,8 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
             compr = "gz"
         elif download_name.endswith(".tar.bz2"):
             compr = "bz2"
+        elif download_name.endswith(".tar.xz"):
+            compr = "xz"
         else:
             raise RuntimeError("fix source for new download type")
         download_tarfile = tarfile.open(name=download_tarfile_path, mode=f"r:{compr}")
@@ -425,6 +440,9 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
                 except Exception as e:
                     # Assert that the patch has already been applied
                     run(["patch", "-p1", "--batch", "--reverse", "--dry-run", "-i", patch_abs], cwd=extract_dir)
+
+    if shell is not None:
+        sp.run(shell, shell=True, check=True, cwd=extract_dir)
     
     if mode == "ctest":
         run(["ctest", "-S", "HDF5config.cmake,BUILD_GENERATOR=Unix", "-C", BUILD_CFG, "-V", "-O", "hdf5.log"], cwd=extract_dir)
@@ -446,6 +464,12 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
             run_cmake(name, build_tool_args, cwd=extract_build_dir)
         else:
             raise ValueError()
+        for fn, before, after in pre_compile_subs:
+            with open(os.path.join(extract_dir, fn), 'r') as f:
+                s = f.read()
+            s = s.replace(before, after)
+            with open(os.path.join(extract_dir, fn), 'w') as f:
+                f.write(s)
         logger.info(f"\rBuilding {name}...   ")
         run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "VERBOSE=1"], cwd=extract_build_dir)
         logger.info(f"\rInstalling {name}... ")
@@ -460,6 +484,9 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
         shutil.copytree(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", f"boost-{BOOST_VERSION}", "boost"))
         logger.info(f"\rInstalled {name}     \n")
 
+    if "diskcleanup" in flags:
+        shutil.rmtree(build_dir, ignore_errors=True)
+
 cecho("Collecting dependencies:", GREEN)
 
 # Set compiler flags for 32bit builds on 64bit system
@@ -470,9 +497,6 @@ ADDITIONAL_ARGS = []
 if platform.system() == "Darwin":
     ADDITIONAL_ARGS = [f"-mmacosx-version-min={TOOLSET}"] + ADDITIONAL_ARGS
 
-if "wasm" in flags:
-    ADDITIONAL_ARGS.extend(("-sWASM_BIGINT", "-fexceptions"))
-
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work
 
@@ -483,7 +507,11 @@ CFLAGS = os.environ.get("CFLAGS", "")
 LDFLAGS = os.environ.get("LDFLAGS", "")
 
 ADDITIONAL_ARGS_STR = " ".join(ADDITIONAL_ARGS)
-if "wasm" not in flags and sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev/null"]) != 0:
+
+if "wasm" in flags:
+    CFLAGS_MINIMAL = CXXFLAGS_MINIMAL = CFLAGS = CXXFLAGS = os.environ['SIDE_MODULE_CFLAGS']
+    LDFLAGS = os.environ['SIDE_MODULE_LDFLAGS']
+elif sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev/null"]) != 0:
     CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
     CFLAGS_MINIMAL = f"{CFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
     if BUILD_STATIC:
@@ -509,6 +537,7 @@ if "lto" in flags:
         locals()[f] += f" -flto={IFCOS_NUM_BUILD_PROCS}"
 
 os.environ["CXXFLAGS"] = CXXFLAGS
+os.environ["CPPFLAGS"] = CXXFLAGS
 os.environ["CFLAGS"] = CFLAGS
 os.environ["LDFLAGS"] = LDFLAGS
 
@@ -520,7 +549,7 @@ if 'hdf5' in targets:
     # not supported
     orig = [os.environ[f] for f in compiler_flags]
     for f in compiler_flags:
-        os.environ[f] = re.sub("-flto(=\w+)?", "", os.environ[f])
+        os.environ[f] = re.sub(r"-flto(=\w+)?", "", os.environ[f])
 
     HDF5_MAJOR = ".".join(HDF5_VERSION.split(".")[:-1])
     build_dependency(
@@ -610,7 +639,7 @@ if USE_OCCT and "occ" in targets:
             "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
             f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype"
         ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
         download_name = "occt",
         download_tool=download_tool_git,
         patch=patches,
@@ -645,8 +674,8 @@ if "libxml2" in targets:
             "--without-iconv",
             "--without-lzma"
         ],
-        download_url="ftp://xmlsoft.org/libxml2/",
-        download_name=f"libxml2-{LIBXML2_VERSION}.tar.gz"
+        download_url=f"https://download.gnome.org/sources/libxml2/{'.'.join(LIBXML2_VERSION.split('.')[0:2])}/",
+        download_name=f"libxml2-{LIBXML2_VERSION}.tar.xz"
     )
     
 if "OpenCOLLADA" in targets:
@@ -679,9 +708,11 @@ if "OpenCOLLADA" in targets:
 
 if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flags:
     # Python should not be built with -fvisibility=hidden, from experience that introduces segfaults
+    OLD_CPP_FLAGS = os.environ["CPPFLAGS"]
     OLD_CXX_FLAGS = os.environ["CXXFLAGS"]
     OLD_C_FLAGS = os.environ["CFLAGS"]
     os.environ["CXXFLAGS"] = CXXFLAGS_MINIMAL
+    os.environ["CPPFLAGS"] = CXXFLAGS_MINIMAL
     os.environ["CFLAGS"] = CFLAGS_MINIMAL
 
     # On OSX a dynamic python library is built or it would not be compatible
@@ -711,6 +742,7 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
             ):
                 raise e
 
+    os.environ["CPPFLAGS"] = OLD_CPP_FLAGS
     os.environ["CXXFLAGS"] = OLD_CXX_FLAGS
     os.environ["CFLAGS"] = OLD_C_FLAGS
 
@@ -730,14 +762,16 @@ if "boost" in targets:
             "--with-thread",
             "--with-date_time",
             "--with-iostreams",
+            "--with-filesystem",
             f"link={LINK_TYPE}",
             *toolset,
             *map(str_concat("cxxflags"), CXXFLAGS.strip().split(' ')),
             *map(str_concat("linkflags"), LDFLAGS.strip().split(' ')),
             "stage", "-s", "NO_BZIP2=1"],
         download_url=BOOST_LOCATION,
-        patch="./patches/boost/boostorg_regex_62.patch",
-        download_name=f"boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2"
+        # don't remember what this is, but fail on 1.86
+        # patch="./patches/boost/boostorg_regex_62.patch",
+        download_name=f"boost-{BOOST_VERSION}-b2-nodocs.tar.gz"
     )
     if "wasm" in flags:
         # only supported on nix for now
@@ -754,6 +788,7 @@ if "cgal" in targets:
         name=f"gmp-{GMP_VERSION}",
         mode="autoconf",
         build_tool_args=[ENABLE_FLAG, DISABLE_FLAG, "--with-pic", *gmp_args],
+        pre_compile_subs=([("build/config.h", "HAVE_OBSTACK_VPRINTF 1", "HAVE_OBSTACK_VPRINTF 0")] if "wasm" in flags else []),
         download_url="https://ftp.gnu.org/gnu/gmp/",
         download_name=f"gmp-{GMP_VERSION}.tar.bz2"
     )
@@ -782,7 +817,7 @@ if "cgal" in targets:
         download_url="https://github.com/CGAL/cgal.git",
         download_name="cgal",
         download_tool=download_tool_git,
-        revision=f"v{CGAL_VERSION}"
+        revision=CGAL_VERSION
     )
 
 if "usd" in targets:
@@ -832,6 +867,7 @@ os.makedirs(executables_dir, exist_ok=True)
 
 
 cmake_args = [
+    "-DCMAKE_CXX_STANDARD="            "17",
     "-DUSE_MMAP="                      "OFF",
     "-DBUILD_EXAMPLES="                "OFF",
     "-DBUILD_SHARED_LIBS="             +OFF_ON[not BUILD_STATIC],
@@ -937,6 +973,7 @@ if "IfcOpenShell-Python" in targets:
     if "wasm" in flags:
         ADDITIONAL_ARGS = f"-Wl,-undefined,suppress -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS=_PyInit__ifcopenshell_wrapper"
         
+    os.environ["CPPFLAGS"] = f"{CXXFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
     os.environ["CXXFLAGS"] = f"{CXXFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
     os.environ["CFLAGS"] = f"{CFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
     os.environ["LDFLAGS"] = f"{LDFLAGS} {ADDITIONAL_ARGS}"
@@ -980,7 +1017,11 @@ if "IfcOpenShell-Python" in targets:
             if platform.system() != "Darwin":
                 if BUILD_CFG == "Release":
                     # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]], cwd=module_dir)
+                    so = glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]
+                    if "wasm" in flags:
+                        run(['wasm-strip', so, '-k', "dylink.0"])
+                    else:
+                        run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", so], cwd=module_dir)
 
             return module_dir
 

pyodide/meta.yaml

@@ -3,11 +3,12 @@ package:
   version: 0.8.0
 
 source:
-  path: IfcOpenShell
+  path: ../../IfcOpenShell
 
 build:
   script: |
-    python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py310 IfcOpenShell-Python
+    BUILD_CFG=Release python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py313 IfcOpenShell-Python
+    mv package/ifcopenshell .
     cp pyodide/setup.py .
 
 about:

pyodide/setup.py

@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
 
-setup(name='IfcOpenShell',
+setup(name='ifcopenshell',
       version='0.8.0',
       description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
       author='Thomas Krijnen',
       author_email='thomas@aecgeeks.com',
       url='http://ifcopenshell.org',
       packages=find_packages(),
-      package_data={'': ['*.so']},
+      package_data={'': ['*.so', '*.json']},
 )

pyproject.toml

@@ -1,35 +1,62 @@
 [tool.black]
 line-length = 120
-include = '''
-    src/(
-        bcf
-        |bcfserver
-        |bonsai
-        |bsdd
-        |foundationserver
-        |ifc2ca
-        |ifc4d
-        |ifc5d
-        |ifcbimtester
-        |ifcblender
-        |ifccityjson
-        |ifcclash
-        |ifccsv
-        |ifcdiff
-        |ifcfm
-        |ifcpatch
-        |ifctester
-        |ifcopenshell-python
-        |ifcsverchok
-        |opencdeserver
-    )/.*.py$
-'''
+include = "src/.*.pyi?$"
 extend-exclude = '''
     src/ifcopenshell-python/ifcopenshell/express/*
     |src/ifcopenshell-python/ifcopenshell/mvd/*
+    |src/ifcopenshell-python/ifcopenshell/simple_spf/*
     |src/ifc2ca/templates/*
+    |src/ifcconvert/cityjson/*
+    |src/svgfill
+    |src/exterior-shell-extractor
+    |src/pyodide
 '''
 
 [tool.pyright]
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
+reportUnnecessaryTypeIgnoreComment = true
+
+# Define here general ruff settings,
+# then they will be inherited projects .toml files.
+# This allows using assuming different Python version for different projects.
+[tool.ruff]
+exclude = [
+    # Submodules.
+    "src/ifcconvert/cityjson",
+    "src/ifcopenshell-python/ifcopenshell/express",
+    "src/ifcopenshell-python/ifcopenshell/mvd",
+    "src/ifcopenshell-python/ifcopenshell/simple_spf",
+    "src/svgfill",
+    #
+    # Unformatted.
+    "src/exterior-shell-extractor",
+    # Incompatible with linter.
+    "src/ifc2ca/templates",
+]
+[tool.ruff.lint]
+select = [
+    # Default Ruff rules.
+    # "E4",        # imports
+    # "E7",        # statements
+    "E9",          # io errors
+    # "F",         # pyflakes
+    #
+    "FA",          # future annotations
+    "UP",          # pyupgrade
+    "RUF015",      # next() > list_comprehension[0]
+]
+ignore = [
+    "FA100", # Conflicts with Blender using annotations for props definitions.
+    # Maybe will enable later:
+    "UP007", # Optional to X | Y
+    "UP045", # Optional to X | None
+    "UP015", # Unnecessary mode argument
+    "UP028", # yield for -> yield from
+    "UP030", # implicit references for positional format fields
+    "UP031", # Replace % with .format
+    "UP032", # Replace .format with f-string
+
+    # Deprecated Ruff rules.
+    "UP038", # Use X | Y in isinstance
+]

src/bcf/bcf/agnostic/extensions.py

@@ -20,7 +20,7 @@ def get_extensions_attributes(extensions: Extensions) -> dict[str, AttributeData
     - subattribute name"""
     possible_attributes = {}
     for field in fields(type(extensions)):
-        field_type = field.type.__args__[0]  # type: ignore [reportAttributeAccessIssue]
+        field_type = field.type.__args__[0]  # pyright: ignore [reportAttributeAccessIssue]
         subfield = next(iter(fields(field_type)))
         xsd_name = subfield.metadata["name"]
         possible_attributes[field.name] = AttributeData(field_type, subfield.name, xsd_name)

src/bcf/bcf/inmemory_zipfile.py

@@ -6,6 +6,7 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 original idea from https://stackoverflow.com/a/19722365/1307905
 """
 
+from __future__ import annotations
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -47,7 +48,7 @@ class InMemoryZipFile:
     def data(self) -> bytes:
         return self.in_memory_data.getvalue()
 
-    def __enter__(self) -> "InMemoryZipFile":
+    def __enter__(self) -> InMemoryZipFile:
         return self
 
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:

src/bcf/bcf/v2/bcfxml.py

@@ -1,5 +1,6 @@
 """BCF XML V2 handler."""
 
+from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -31,7 +32,7 @@ class BcfXml:
         self._extension_schema: Optional[bytes] = None
         self._zip_file = self._load_zip_file()
 
-    def __enter__(self) -> "BcfXml":
+    def __enter__(self) -> BcfXml:
         return self
 
     def __exit__(self, *args: Any) -> None:
@@ -99,7 +100,7 @@ class BcfXml:
             extensions = mdl_extensions.Extensions()
 
             xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO((self.extension_schema)))
+            root = etree.parse(io.BytesIO(self.extension_schema))
 
             attrs = bcf.agnostic.extensions.get_extensions_attributes(extensions)
             xsd_to_attrs = {v.subattr_xsd_name: k for k, v in attrs.items()}
@@ -148,7 +149,7 @@ class BcfXml:
         return topics
 
     @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
         """
         Create a BcfXml object from a file.
 
@@ -172,7 +173,7 @@ class BcfXml:
         cls,
         project_name: Optional[str] = None,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> "BcfXml":
+    ) -> BcfXml:
         """
         Create a new BcfXml object.
 
@@ -261,7 +262,7 @@ class BcfXml:
         )
 
     # region Deprecated methods
-    def new_project(self) -> "BcfXml":
+    def new_project(self) -> BcfXml:
         """Deprecated method."""
         warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
         return self.create_new()

src/bcf/bcf/v2/model/extensions.py

@@ -14,16 +14,20 @@
 # Currently extensions support for v2 is only read-only.
 
 
+import sys
 from dataclasses import dataclass, field, fields
-from typing import List, NamedTuple, Optional
+from typing import Optional
 
 
-@dataclass(slots=True, kw_only=True)
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
+
+
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsPriorities:
     class Meta:
         global_type = False
 
-    priority: List[str] = field(
+    priority: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Priority",
@@ -35,12 +39,12 @@ class ExtensionsPriorities:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsSnippetTypes:
     class Meta:
         global_type = False
 
-    snippet_type: List[str] = field(
+    snippet_type: list[str] = field(
         default_factory=list,
         metadata={
             "name": "SnippetType",
@@ -52,12 +56,12 @@ class ExtensionsSnippetTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsStages:
     class Meta:
         global_type = False
 
-    stage: List[str] = field(
+    stage: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Stage",
@@ -69,12 +73,12 @@ class ExtensionsStages:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicLabels:
     class Meta:
         global_type = False
 
-    topic_label: List[str] = field(
+    topic_label: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicLabel",
@@ -86,12 +90,12 @@ class ExtensionsTopicLabels:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicStatuses:
     class Meta:
         global_type = False
 
-    topic_status: List[str] = field(
+    topic_status: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicStatus",
@@ -103,12 +107,12 @@ class ExtensionsTopicStatuses:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicTypes:
     class Meta:
         global_type = False
 
-    topic_type: List[str] = field(
+    topic_type: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicType",
@@ -120,12 +124,12 @@ class ExtensionsTopicTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsUsers:
     class Meta:
         global_type = False
 
-    user: List[str] = field(
+    user: list[str] = field(
         default_factory=list,
         metadata={
             "name": "UserIdType",
@@ -137,7 +141,7 @@ class ExtensionsUsers:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Extensions:
     topic_types: Optional[ExtensionsTopicTypes] = field(
         default=None,

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

@@ -1,10 +1,13 @@
+import sys
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 from xsdata.models.datatype import XmlDateTime
 
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-@dataclass(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class BimSnippet:
     reference: str = field(
         metadata={
@@ -38,7 +41,7 @@ class BimSnippet:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class CommentViewpoint:
     class Meta:
         global_type = False
@@ -53,7 +56,7 @@ class CommentViewpoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class HeaderFile:
     class Meta:
         global_type = False
@@ -109,7 +112,7 @@ class HeaderFile:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicDocumentReference:
     class Meta:
         global_type = False
@@ -147,7 +150,7 @@ class TopicDocumentReference:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicRelatedTopic:
     class Meta:
         global_type = False
@@ -162,7 +165,7 @@ class TopicRelatedTopic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewPoint:
     viewpoint: Optional[str] = field(
         default=None,
@@ -198,7 +201,7 @@ class ViewPoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Comment:
     date: XmlDateTime = field(
         metadata={
@@ -258,9 +261,9 @@ class Comment:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Header:
-    file: List[HeaderFile] = field(
+    file: list[HeaderFile] = field(
         default_factory=list,
         metadata={
             "name": "File",
@@ -271,9 +274,9 @@ class Header:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Topic:
-    reference_link: List[str] = field(
+    reference_link: list[str] = field(
         default_factory=list,
         metadata={
             "name": "ReferenceLink",
@@ -305,7 +308,7 @@ class Topic:
             "namespace": "",
         },
     )
-    labels: List[str] = field(
+    labels: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Labels",
@@ -385,7 +388,7 @@ class Topic:
             "namespace": "",
         },
     )
-    document_reference: List[TopicDocumentReference] = field(
+    document_reference: list[TopicDocumentReference] = field(
         default_factory=list,
         metadata={
             "name": "DocumentReference",
@@ -393,7 +396,7 @@ class Topic:
             "namespace": "",
         },
     )
-    related_topic: List[TopicRelatedTopic] = field(
+    related_topic: list[TopicRelatedTopic] = field(
         default_factory=list,
         metadata={
             "name": "RelatedTopic",
@@ -425,7 +428,7 @@ class Topic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Markup:
     header: Optional[Header] = field(
         default=None,
@@ -443,7 +446,7 @@ class Markup:
             "required": True,
         }
     )
-    comment: List[Comment] = field(
+    comment: list[Comment] = field(
         default_factory=list,
         metadata={
             "name": "Comment",
@@ -451,7 +454,7 @@ class Markup:
             "namespace": "",
         },
     )
-    viewpoints: List[ViewPoint] = field(
+    viewpoints: list[ViewPoint] = field(
         default_factory=list,
         metadata={
             "name": "Viewpoints",

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

@@ -1,8 +1,11 @@
+import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-@dataclass(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class Project:
     name: Optional[str] = field(
         default=None,
@@ -21,7 +24,7 @@ class Project:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ProjectExtension:
     project: Optional[Project] = field(
         default=None,

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

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

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

@@ -1,6 +1,9 @@
+import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import List, Optional
+from typing import Optional
+
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
 
 class BitmapFormat(Enum):
@@ -8,7 +11,7 @@ class BitmapFormat(Enum):
     JPG = "JPG"
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Component:
     originating_system: Optional[str] = field(
         default=None,
@@ -35,7 +38,7 @@ class Component:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Direction:
     x: float = field(
         metadata={
@@ -60,7 +63,7 @@ class Direction:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Point:
     x: float = field(
         metadata={
@@ -85,7 +88,7 @@ class Point:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewSetupHints:
     spaces_visible: Optional[bool] = field(
         default=None,
@@ -110,7 +113,7 @@ class ViewSetupHints:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ClippingPlane:
     location: Point = field(
         metadata={
@@ -128,12 +131,12 @@ class ClippingPlane:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoringColor:
     class Meta:
         global_type = False
 
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -151,9 +154,9 @@ class ComponentColoringColor:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentSelection:
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -163,12 +166,12 @@ class ComponentSelection:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibilityExceptions:
     class Meta:
         global_type = False
 
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -178,7 +181,7 @@ class ComponentVisibilityExceptions:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Line:
     start_point: Point = field(
         metadata={
@@ -196,7 +199,7 @@ class Line:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class OrthogonalCamera:
     """
     Attributes
@@ -236,7 +239,7 @@ class OrthogonalCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class PerspectiveCamera:
     """
     Attributes
@@ -281,7 +284,7 @@ class PerspectiveCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoBitmap:
     class Meta:
         global_type = False
@@ -330,9 +333,9 @@ class VisualizationInfoBitmap:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoring:
-    color: List[ComponentColoringColor] = field(
+    color: list[ComponentColoringColor] = field(
         default_factory=list,
         metadata={
             "name": "Color",
@@ -342,7 +345,7 @@ class ComponentColoring:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibility:
     exceptions: Optional[ComponentVisibilityExceptions] = field(
         default=None,
@@ -360,12 +363,12 @@ class ComponentVisibility:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoClippingPlanes:
     class Meta:
         global_type = False
 
-    clipping_plane: List[ClippingPlane] = field(
+    clipping_plane: list[ClippingPlane] = field(
         default_factory=list,
         metadata={
             "name": "ClippingPlane",
@@ -374,12 +377,12 @@ class VisualizationInfoClippingPlanes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoLines:
     class Meta:
         global_type = False
 
-    line: List[Line] = field(
+    line: list[Line] = field(
         default_factory=list,
         metadata={
             "name": "Line",
@@ -389,7 +392,7 @@ class VisualizationInfoLines:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Components:
     view_setup_hints: Optional[ViewSetupHints] = field(
         default=None,
@@ -421,7 +424,7 @@ class Components:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfo:
     """
     VisualizationInfo documentation.
@@ -462,7 +465,7 @@ class VisualizationInfo:
             "type": "Element",
         },
     )
-    bitmap: List[VisualizationInfoBitmap] = field(
+    bitmap: list[VisualizationInfoBitmap] = field(
         default_factory=list,
         metadata={
             "name": "Bitmap",

src/bcf/bcf/v2/topic.py

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

src/bcf/bcf/v2/visinfo.py

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

src/bcf/bcf/v3/bcfapi.py

@@ -21,11 +21,11 @@ import http.server
 import os
 import tempfile
 import time
-import urllib
+import urllib.parse
 import uuid
 import webbrowser
 from re import A
-from typing import Any, Optional, Tuple
+from typing import Any, Optional
 
 import requests
 
@@ -40,7 +40,7 @@ class OAuthReceiver(http.server.BaseHTTPRequestHandler):
         self.send_response(200)
         self.send_header("Content-type", "text/plain")
         self.end_headers()
-        self.wfile.write("You have now authenticated :) You may now close this browser window.".encode("utf-8"))
+        self.wfile.write(b"You have now authenticated :) You may now close this browser window.")
 
 
 class FoundationClient:
@@ -174,7 +174,7 @@ class BcfClient:
         except requests.exceptions.HTTPError as e:
             print(f"message: {response.reason}'   '{response.status_code}'   '{ e }")
 
-    def post(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
+    def post(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
         headers = {
             "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
             "Content-type": "application/json",
@@ -192,7 +192,7 @@ class BcfClient:
             print(f"message: {response.reason}'  '{response.status_code}, {errh}")
             return response.status_code, response.reason
 
-    def put(self, endpoint: str, data: Any = None, params: Any = None) -> Tuple[int, str]:
+    def put(self, endpoint: str, data: Any = None, params: Any = None) -> tuple[int, str]:
         headers = {
             "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
             "Content-type": "application/json",
@@ -210,7 +210,7 @@ class BcfClient:
             print(f"message: {response.reason}'  '{response.status_code}, {errh}")
             return response.status_code, response.reason
 
-    def delete(self, endpoint: str, params: Any = None) -> Tuple[int, str]:
+    def delete(self, endpoint: str, params: Any = None) -> tuple[int, str]:
         headers = {
             "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
             "Content-type": "application/json",
@@ -237,7 +237,7 @@ class BcfClient:
             },
         )
 
-    def update_project(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
+    def update_project(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
         url = f"{self.baseurl}/projects/{project_id}"
         headers = {"Authorization": f"Bearer {self.foundation_client.get_access_token()}"}
         resp = requests.put(url, headers=headers, data=data)
@@ -276,16 +276,16 @@ class BcfClient:
             },
         )
 
-    def create_topic(self, project_id: str = "", data: Any = None) -> Tuple[int, str]:
+    def create_topic(self, project_id: str = "", data: Any = None) -> tuple[int, str]:
         return self.post(f"/projects/{project_id}/topics", data=data)
 
-    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
+    def update_topic(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
         return self.put(f"/projects/{project_id}/topics/{topic_id}", data=data)
 
-    def delete_topic(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
+    def delete_topic(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
         return self.delete(f"/projects/{project_id}/topics/{topic_id}")
 
-    def get_snippet(self, project_id: str = "", topic_id: str = "") -> Tuple[int, str]:
+    def get_snippet(self, project_id: str = "", topic_id: str = "") -> tuple[int, str]:
         headers = {
             "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
             "Content-type": "application/octet-stream",
@@ -332,7 +332,7 @@ class BcfClient:
         topic_id: str = "",
         data: Any = None,
         params: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.put(
             f"/projects/{project_id}/topics/{topic_id}/files",
             data=data,
@@ -347,7 +347,7 @@ class BcfClient:
         topic_id: str = "",
         data: Any = None,
         params: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.post(
             f"/projects/{project_id}/topics/{topic_id}/comments",
             data=data,
@@ -363,7 +363,7 @@ class BcfClient:
             },
         )
 
-    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> Tuple[int, str]:
+    def delete_comment(self, project_id: str = "", topic_id: str = "", comment_id: str = "") -> tuple[int, str]:
         return self.delete(f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}")
 
     def update_comment(
@@ -372,7 +372,7 @@ class BcfClient:
         topic_id: str = "",
         comment_id: str = "",
         data: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.put(
             f"/projects/{project_id}/topics/{topic_id}/comments/{comment_id}",
             data=data,
@@ -387,7 +387,7 @@ class BcfClient:
             },
         )
 
-    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> Tuple[int, str]:
+    def create_viewpoints(self, project_id: str = "", topic_id: str = "", data: Any = None) -> tuple[int, str]:
         return self.post(
             f"/projects/{project_id}/topics/{topic_id}/viewpoints",
             data=data,
@@ -408,7 +408,7 @@ class BcfClient:
         project_id: str = "",
         topic_id: str = "",
         viewpoint_id: str = "",
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.delete(
             f"/projects/{project_id}/topics/{topic_id}/viewpoints/{viewpoint_id}",
         )
@@ -478,7 +478,7 @@ class BcfClient:
         project_id: str = "",
         topic_id: str = "",
         data: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.put(
             f"/projects/{project_id}/topics/{topic_id}/related_topics",
             data=data,
@@ -498,7 +498,7 @@ class BcfClient:
         project_id: str = "",
         topic_id: str = "",
         data: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.post(
             f"/projects/{project_id}/topics/{topic_id}/document_references",
             data=data,
@@ -510,7 +510,7 @@ class BcfClient:
         topic_id: str = "",
         document_reference_id: str = "",
         data: Any = None,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         return self.put(
             f"/projects/{project_id}/topics/{topic_id}/document_references/{document_reference_id}",
             data=data,
@@ -543,7 +543,7 @@ class BcfClient:
 
         return response.status_code
 
-    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> Tuple[int, str]:
+    def get_document(self, project_id: str = "", topic_id: str = "", document_id: str = "") -> tuple[int, str]:
         headers = {
             "Authorization": f"Bearer {self.foundation_client.get_access_token()}",
             "Content-type": "application/octet-stream",

src/bcf/bcf/v3/bcfxml.py

@@ -1,5 +1,6 @@
 """BCF XML V3 handlers."""
 
+from __future__ import annotations
 import uuid
 import warnings
 import zipfile
@@ -30,7 +31,7 @@ class BcfXml:
         self._documents: Optional[DocumentsHandler] = None
         self._zip_file = self._load_zip_file()
 
-    def __enter__(self) -> "BcfXml":
+    def __enter__(self) -> BcfXml:
         return self
 
     def __exit__(self, *args: Any) -> None:
@@ -116,7 +117,7 @@ class BcfXml:
         return self._documents
 
     @classmethod
-    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional["BcfXml"]:
+    def load(cls, filename: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
         """
         Create a BcfXml object from a file.
 
@@ -141,7 +142,7 @@ class BcfXml:
         project_name: Optional[str] = None,
         extensions: Optional[mdl.Extensions] = None,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> "BcfXml":
+    ) -> BcfXml:
         """
         Create a new BcfXml object.
 
@@ -239,7 +240,7 @@ class BcfXml:
         )
 
     # region Deprecated methods
-    def new_project(self) -> "BcfXml":
+    def new_project(self) -> BcfXml:
         """Deprecated method."""
         warnings.warn("new_project is deprecated, use create_new instead.", DeprecationWarning)
         return self.create_new()

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

@@ -1,8 +1,11 @@
+import sys
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
+
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Document:
     filename: str = field(
         metadata={
@@ -34,12 +37,12 @@ class Document:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class DocumentInfoDocuments:
     class Meta:
         global_type = False
 
-    document: List[Document] = field(
+    document: list[Document] = field(
         default_factory=list,
         metadata={
             "name": "Document",
@@ -49,7 +52,7 @@ class DocumentInfoDocuments:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class DocumentInfo:
     documents: Optional[DocumentInfoDocuments] = field(
         default=None,

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

@@ -1,13 +1,16 @@
+import sys
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
+
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsPriorities:
     class Meta:
         global_type = False
 
-    priority: List[str] = field(
+    priority: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Priority",
@@ -19,12 +22,12 @@ class ExtensionsPriorities:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsSnippetTypes:
     class Meta:
         global_type = False
 
-    snippet_type: List[str] = field(
+    snippet_type: list[str] = field(
         default_factory=list,
         metadata={
             "name": "SnippetType",
@@ -36,12 +39,12 @@ class ExtensionsSnippetTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsStages:
     class Meta:
         global_type = False
 
-    stage: List[str] = field(
+    stage: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Stage",
@@ -53,12 +56,12 @@ class ExtensionsStages:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicLabels:
     class Meta:
         global_type = False
 
-    topic_label: List[str] = field(
+    topic_label: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicLabel",
@@ -70,12 +73,12 @@ class ExtensionsTopicLabels:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicStatuses:
     class Meta:
         global_type = False
 
-    topic_status: List[str] = field(
+    topic_status: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicStatus",
@@ -87,12 +90,12 @@ class ExtensionsTopicStatuses:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsTopicTypes:
     class Meta:
         global_type = False
 
-    topic_type: List[str] = field(
+    topic_type: list[str] = field(
         default_factory=list,
         metadata={
             "name": "TopicType",
@@ -104,12 +107,12 @@ class ExtensionsTopicTypes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ExtensionsUsers:
     class Meta:
         global_type = False
 
-    user: List[str] = field(
+    user: list[str] = field(
         default_factory=list,
         metadata={
             "name": "User",
@@ -121,7 +124,7 @@ class ExtensionsUsers:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Extensions:
     topic_types: Optional[ExtensionsTopicTypes] = field(
         default=None,

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

@@ -1,10 +1,13 @@
+import sys
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 from xsdata.models.datatype import XmlDateTime
 
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-@dataclass(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class BimSnippet:
     reference: str = field(
         metadata={
@@ -44,7 +47,7 @@ class BimSnippet:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class CommentViewpoint:
     class Meta:
         global_type = False
@@ -59,7 +62,7 @@ class CommentViewpoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class DocumentReference:
     document_guid: Optional[str] = field(
         default=None,
@@ -100,7 +103,7 @@ class DocumentReference:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class File:
     filename: Optional[str] = field(
         default=None,
@@ -157,12 +160,12 @@ class File:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicLabels:
     class Meta:
         global_type = False
 
-    label: List[str] = field(
+    label: list[str] = field(
         default_factory=list,
         metadata={
             "name": "Label",
@@ -174,12 +177,12 @@ class TopicLabels:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicReferenceLinks:
     class Meta:
         global_type = False
 
-    reference_link: List[str] = field(
+    reference_link: list[str] = field(
         default_factory=list,
         metadata={
             "name": "ReferenceLink",
@@ -191,7 +194,7 @@ class TopicReferenceLinks:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicRelatedTopicsRelatedTopic:
     class Meta:
         global_type = False
@@ -206,7 +209,7 @@ class TopicRelatedTopicsRelatedTopic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewPoint:
     viewpoint: Optional[str] = field(
         default=None,
@@ -246,7 +249,7 @@ class ViewPoint:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Comment:
     date: XmlDateTime = field(
         metadata={
@@ -312,12 +315,12 @@ class Comment:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class HeaderFiles:
     class Meta:
         global_type = False
 
-    file: List[File] = field(
+    file: list[File] = field(
         default_factory=list,
         metadata={
             "name": "File",
@@ -327,12 +330,12 @@ class HeaderFiles:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicDocumentReferences:
     class Meta:
         global_type = False
 
-    document_reference: List[DocumentReference] = field(
+    document_reference: list[DocumentReference] = field(
         default_factory=list,
         metadata={
             "name": "DocumentReference",
@@ -342,12 +345,12 @@ class TopicDocumentReferences:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicRelatedTopics:
     class Meta:
         global_type = False
 
-    related_topic: List[TopicRelatedTopicsRelatedTopic] = field(
+    related_topic: list[TopicRelatedTopicsRelatedTopic] = field(
         default_factory=list,
         metadata={
             "name": "RelatedTopic",
@@ -357,12 +360,12 @@ class TopicRelatedTopics:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicViewpoints:
     class Meta:
         global_type = False
 
-    view_point: List[ViewPoint] = field(
+    view_point: list[ViewPoint] = field(
         default_factory=list,
         metadata={
             "name": "ViewPoint",
@@ -372,7 +375,7 @@ class TopicViewpoints:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Header:
     files: Optional[HeaderFiles] = field(
         default=None,
@@ -384,12 +387,12 @@ class Header:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class TopicComments:
     class Meta:
         global_type = False
 
-    comment: List[Comment] = field(
+    comment: list[Comment] = field(
         default_factory=list,
         metadata={
             "name": "Comment",
@@ -399,7 +402,7 @@ class TopicComments:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Topic:
     reference_links: Optional[TopicReferenceLinks] = field(
         default=None,
@@ -596,7 +599,7 @@ class Topic:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Markup:
     header: Optional[Header] = field(
         default=None,

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

@@ -1,8 +1,11 @@
+import sys
 from dataclasses import dataclass, field
 from typing import Optional
 
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
-@dataclass(slots=True, kw_only=True)
+
+@dataclass(**DATACLASS_KWARGS)
 class Project:
     name: Optional[str] = field(
         default=None,
@@ -25,7 +28,7 @@ class Project:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ProjectInfo:
     project: Project = field(
         metadata={

src/bcf/bcf/v3/model/version.py

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

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

@@ -1,6 +1,10 @@
+import sys
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import List, Optional
+from typing import Optional
+
+
+DATACLASS_KWARGS = {} if sys.version_info < (3, 10) else {"slots": True, "kw_only": True}
 
 
 class BitmapFormat(Enum):
@@ -8,7 +12,7 @@ class BitmapFormat(Enum):
     JPG = "jpg"
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Component:
     originating_system: Optional[str] = field(
         default=None,
@@ -39,7 +43,7 @@ class Component:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Direction:
     x: float = field(
         metadata={
@@ -64,7 +68,7 @@ class Direction:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Point:
     x: float = field(
         metadata={
@@ -89,7 +93,7 @@ class Point:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ViewSetupHints:
     spaces_visible: bool = field(
         default=False,
@@ -114,7 +118,7 @@ class ViewSetupHints:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Bitmap:
     format: BitmapFormat = field(
         metadata={
@@ -162,7 +166,7 @@ class Bitmap:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ClippingPlane:
     location: Point = field(
         metadata={
@@ -180,12 +184,12 @@ class ClippingPlane:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoringColorComponents:
     class Meta:
         global_type = False
 
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -195,9 +199,9 @@ class ComponentColoringColorComponents:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentSelection:
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -206,12 +210,12 @@ class ComponentSelection:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibilityExceptions:
     class Meta:
         global_type = False
 
-    component: List[Component] = field(
+    component: list[Component] = field(
         default_factory=list,
         metadata={
             "name": "Component",
@@ -220,7 +224,7 @@ class ComponentVisibilityExceptions:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Line:
     start_point: Point = field(
         metadata={
@@ -238,7 +242,7 @@ class Line:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class OrthogonalCamera:
     """
     Attributes
@@ -288,7 +292,7 @@ class OrthogonalCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class PerspectiveCamera:
     """
     Attributes
@@ -344,7 +348,7 @@ class PerspectiveCamera:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoringColor:
     class Meta:
         global_type = False
@@ -366,7 +370,7 @@ class ComponentColoringColor:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentVisibility:
     view_setup_hints: Optional[ViewSetupHints] = field(
         default=None,
@@ -391,12 +395,12 @@ class ComponentVisibility:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoBitmaps:
     class Meta:
         global_type = False
 
-    bitmap: List[Bitmap] = field(
+    bitmap: list[Bitmap] = field(
         default_factory=list,
         metadata={
             "name": "Bitmap",
@@ -405,12 +409,12 @@ class VisualizationInfoBitmaps:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoClippingPlanes:
     class Meta:
         global_type = False
 
-    clipping_plane: List[ClippingPlane] = field(
+    clipping_plane: list[ClippingPlane] = field(
         default_factory=list,
         metadata={
             "name": "ClippingPlane",
@@ -419,12 +423,12 @@ class VisualizationInfoClippingPlanes:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfoLines:
     class Meta:
         global_type = False
 
-    line: List[Line] = field(
+    line: list[Line] = field(
         default_factory=list,
         metadata={
             "name": "Line",
@@ -433,9 +437,9 @@ class VisualizationInfoLines:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class ComponentColoring:
-    color: List[ComponentColoringColor] = field(
+    color: list[ComponentColoringColor] = field(
         default_factory=list,
         metadata={
             "name": "Color",
@@ -444,7 +448,7 @@ class ComponentColoring:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class Components:
     selection: Optional[ComponentSelection] = field(
         default=None,
@@ -469,7 +473,7 @@ class Components:
     )
 
 
-@dataclass(slots=True, kw_only=True)
+@dataclass(**DATACLASS_KWARGS)
 class VisualizationInfo:
     """
     VisualizationInfo documentation.

src/bcf/bcf/v3/topic.py

@@ -1,5 +1,6 @@
 """BCF XML V3 Topic handler."""
 
+from __future__ import annotations
 import datetime
 import uuid
 import zipfile
@@ -91,12 +92,12 @@ class TopicHandler:
         self._bim_snippet = value
 
     @property
-    def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
+    def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
         if self._viewpoints is None:
             self._viewpoints = self._load_viewpoints()
         return self._viewpoints
 
-    def _load_viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
+    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
         if self._topic_dir and self.topic.viewpoints and (viewpoints := self.topic.viewpoints.view_point):
             return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
         return {}
@@ -139,7 +140,7 @@ class TopicHandler:
         topic_type: str = "",
         topic_status: str = "",
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> "TopicHandler":
+    ) -> TopicHandler:
         """
         Create a new BCF topic.
 

src/bcf/bcf/v3/visinfo.py

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

src/bcf/bcf/xml_parser.py

@@ -1,6 +1,6 @@
 """XML Parser and Serializer factories."""
 
-from typing import Optional, Protocol, Type, TypeVar
+from typing import Optional, Protocol, TypeVar
 
 from xsdata.formats.dataclass.context import XmlContext
 from xsdata.formats.dataclass.parsers import XmlParser
@@ -29,7 +29,7 @@ T = TypeVar("T")
 class AbstractXmlParserSerializer(Protocol):
     """XML Parser and serializer wrapper."""
 
-    def parse(self, xml: bytes, clazz: Type[T]) -> T:
+    def parse(self, xml: bytes, clazz: type[T]) -> T:
         """
         Parse an XML file to an object.
 
@@ -61,7 +61,7 @@ class XmlParserSerializer:
         self.parser = build_xml_parser(self.context)
         self.serializer = build_serializer(self.context)
 
-    def parse(self, xml: bytes, clazz: Type[T]) -> T:
+    def parse(self, xml: bytes, clazz: type[T]) -> T:
         """
         Parse an XML file to an object.
 

src/bcf/pyproject.toml

@@ -16,6 +16,7 @@ dependencies = [
     "xsdata>=24.4",
     "numpy",
     "ifcopenshell",
+    "requests",
 ]
 version = "0.0.0"
 classifiers = [

src/bonsai/Makefile

@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
+SHELL := sh
 PYTHON:=python3.11
 PIP:=pip3.11
 PATCH:=patch
@@ -46,6 +47,7 @@ VERSION_MINOR:=$(shell cat '../../VERSION' | cut -d '.' -f 2)
 VERSION_PATCH:=$(shell cat '../../VERSION' | cut -d '.' -f 3)
 VERSION_DATE:=$(shell date '+%y%m%d')
 LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
+LAST_COMMIT_DATE:=$(shell git show -s --format=%cI)
 PYVERSION:=py310
 PYPI_IMP:=cp
 
@@ -85,7 +87,7 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=0e5008d
+OLD:=ec13294
 .PHONY: bump
 bump:
 ifndef NEW
@@ -136,7 +138,7 @@ endif
 	# odfpy doesn't come with its own wheel, so whee'l (get it?) create it ourselves!
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel odfpy --wheel-dir=./wheels
 	# Required by IFCCityJSON
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download cjio --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "cjio >=0.8, <0.10" --dest=./wheels
 	# Required in general for sorting all sorts of stuff in a nice way
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download natsort --dest=./wheels
 	# Provides express rule validation for ifcopenshell.validate
@@ -177,6 +179,8 @@ endif
 	# 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 to access platform specific paths
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download platformdirs --dest=./wheels
 	# Required by light module
 	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
@@ -189,13 +193,15 @@ else
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 endif
 
+	# jQuery is required for web UI functionality
+	cd build/bonsai/bim/data/webui/static/js/ && wget https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js
+
 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
 	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
 	cd build/bonsai/bim/data/gantt/ && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.css
 
 	# Provides IFCJSON functionality
-	# 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 && wget -O ifc2json.zip https://github.com/IFCJSON-Team/IFC2JSON_python/archive/refs/heads/master.zip
 	cd build && unzip ifc2json.zip && rm ifc2json.zip
 	# IFCJSON doesn't have pyproject.toml, so we use python command.
 	cd build && . env/$(VENV_ACTIVATE) && cd IFC2JSON_python-*/file_converters && \
@@ -212,7 +218,7 @@ endif
 	# Brickschema requires pkg_resources which is provided by Blender.
 	# Provides Brickschema functionality
 	# For now lets bundle the latest nightly schema
-	cd build/bonsai/bim/schema && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd build/bonsai/bim/data/brick/ && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
 
 	# Required for hipped roof generation
 	cd build && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
@@ -226,8 +232,16 @@ endif
 		)" bdist_wheel
 	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/
 
-	# Required for Desktop icon and file association
-	cp -r bonsai/libs/desktop build/bonsai/libs/
+	# folder for executable files
+	mkdir -p build/bonsai/libs/bin
+
+	# required for three-way git merging
+ifeq ($(PLATFORM), win)
+	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip
+	cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
+else
+	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
+endif
 
 	# Generate translations module for Bonsai build
 	git clone https://github.com/IfcOpenShell/bonsai-translations.git build/working
@@ -244,6 +258,7 @@ ifeq ($(IS_STABLE), TRUE)
 else
 	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/bonsai/blender_manifest.toml
 	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/bonsai/__init__.py
+	$(SED) "s/9999999/$(LAST_COMMIT_DATE)/" build/bonsai/__init__.py
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
 endif
 
@@ -268,54 +283,11 @@ endif
 	fi
 	mv build/wheels/*.whl build/bonsai/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/bonsai/wheels/lxml-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
+	# Temporary workaround for Blender not handling non-3.11 wheels #5743.
+	# Use '-n' as on macos x86-64 doesn't have a binary wheel and it autoincludes 'cp311'.
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# Has only universal build.
-	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-endif
-ifeq ($(PLATFORM), macos)
-	# Has universal and arm64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# has universal and arm builds.
-	prev_whl_name=$$(find build/bonsai/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/bonsai/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
+	whl_name=$$(echo $$prev_whl_name | sed "s/-cp39-/-cp$(PYNUMBER)-/"); \
+	mv --update=none "$$prev_whl_name" "$$whl_name";
 
 ifneq ($(PLATFORM), linux)
 	# Safeguard: in case one of `pip download` will break,
@@ -333,6 +305,7 @@ endif
 	rm -rf build/bonsai/bim/
 	rm -rf build/bonsai/core/
 	rm -rf build/bonsai/tool/
+	rm -rf build/bonsai/libs/
 
 ifeq ($(IS_STABLE), TRUE)
 	cd build && zip -r bonsai_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./bonsai
@@ -376,6 +349,12 @@ else
 	pytest test/tool/test_$(MODULE).py
 endif
 
+# Reregistering test is not added to the standard test suite because during unregister
+# Blender removes all Bonsai dependencies breaking dev-environment symlinks.
+.PHONY: test-reregister
+test-reregister:
+	blender --python scripts/reregister_bonsai.py
+
 .PHONY: qa
 qa:
 	black .

src/bonsai/bonsai/__init__.py

@@ -28,6 +28,10 @@ IN_BLENDER = sys.modules.get("bpy", None)
 if IN_BLENDER:
     import bpy
 
+# This file is executed twice - first as a bonsai-extension
+# and then as a bonsai-package.
+IN_PACKAGE = __package__ == "bonsai"
+
 import re
 import platform
 import traceback
@@ -36,10 +40,12 @@ import uuid
 import shutil
 from collections import deque
 from pathlib import Path
-from typing import Union, Any, Generator
+from typing import Union, Any
+from collections.abc import Generator
 
 
 last_commit_hash = "8888888"
+last_commit_date = "9999999"
 
 
 def get_last_commit_hash() -> Union[str, None]:
@@ -51,6 +57,12 @@ def get_last_commit_hash() -> Union[str, None]:
     return last_commit_hash[:7]
 
 
+def get_last_commit_date() -> Union[str, None]:
+    if last_commit_date == str(9_999999):
+        return None
+    return last_commit_date
+
+
 # Accessed from bonsai extension:
 bbim_semver: dict[str, Any] = {}
 
@@ -96,6 +108,7 @@ def get_debug_info():
         "blender_version": bpy.app.version_string,
         "bonsai_version": bbim_version,
         "bonsai_commit_hash": get_last_commit_hash(),
+        "bonsai_commit_date": get_last_commit_date(),
         "last_actions": last_actions,
         "last_error": last_error,
     }
@@ -210,16 +223,21 @@ if IN_BLENDER:
         info["binary_python_version"] = version
         return info
 
-    try:
-        import git
+    def update_commit_data() -> None:
+        try:
+            import git
 
-        # We can't just use __file__ as bonsai/__init__.py is typically not symlinked
-        # as Blender have errors symlinking main addon package file.
-        path = Path(__file__).resolve().parent
-        repo = git.Repo(str(path), search_parent_directories=True)
-        last_commit_hash = repo.head.object.hexsha
-    except:
-        pass
+            global last_commit_hash
+            global last_commit_date
+            path = Path(__file__).resolve().parent
+            repo = git.Repo(str(path), search_parent_directories=True)
+            last_commit_hash = repo.head.object.hexsha
+            last_commit_date = repo.head.object.committed_datetime.isoformat()
+        except:
+            pass
+
+    if IN_PACKAGE:
+        update_commit_data()
 
     try:
         import ifcopenshell.api
@@ -235,6 +253,12 @@ if IN_BLENDER:
 
         ifcopenshell.api.add_pre_listener("*", "action_logger", log_api)
 
+        def purge_cache():
+            """Purge cache left from previous session (e.g. after reload or update)."""
+            import bonsai.tool as tool
+
+            tool.Blender.get_bonsai_version.cache_clear()
+
         def register():
             if platform.system() == "Windows":
                 clean_up_dlls_safe_links()
@@ -252,6 +276,7 @@ if IN_BLENDER:
                 bonsai.REINSTALLED_BBIM_VERSION = current_version
 
             bonsai.bim.register()
+            purge_cache()
 
         def unregister():
             if platform.system() == "Windows":
@@ -317,7 +342,7 @@ if IN_BLENDER:
                     # But Blender currently doesn't support separate builds for different Python version,
                     # so those issues might still slip in.
                     box.label(text="Bonsai installed for wrong Python version.")
-                    box.label(text=f"Expected: {py}. Got: {binary_py}.")
+                    box.label(text=f"Expected binary version: {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
@@ -325,7 +350,13 @@ if IN_BLENDER:
                     box.label(text="Try reinstalling with the correct Python version.")
                     box.label(text="Before reinstallation make sure to")
                     box.label(text="DISABLE Bonsai (uninstallation won't help).")
-                    box.label(text="You can download correct version below.")
+                    if py == "3.11":
+                        box.label(text="You can download correct version below.")
+                    else:
+                        box.label(text="Since you're using Python >3.11,")
+                        box.label(text="installation from Blender extensions platform")
+                        box.label(text="is not supported and you need to download")
+                        box.label(text="and install Bonsai from the link below.")
 
                 layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
                 op = layout.operator("bim.open_uri", text="How Can I Fix This?")

src/bonsai/bonsai/bim/.gitignore

@@ -1,2 +0,0 @@
-# addon writes tmp stuff directly to its dir
-/data/

src/bonsai/bonsai/bim/__init__.py

@@ -20,9 +20,10 @@ import os
 import bpy
 import bpy.utils.previews
 import importlib
-from pathlib import Path
-from . import handler, ui, prop, operator, helper
-from typing import Callable, Union
+from bpy_extras.io_utils import ImportHelper, ExportHelper
+from . import handler, ui, prop, operator
+from typing import Union
+from collections.abc import Callable
 
 try:
     from bonsai.translations import translations_dict
@@ -84,6 +85,7 @@ modules = {
     "covering": None,
     "web": None,
     "light": None,
+    "alignment": None,
     # Uncomment this line to enable loading of the demo module. Happy hacking!
     # The name "demo" must correlate to a folder name in `bim/module/`.
     # "demo": None,
@@ -95,32 +97,37 @@ for name in modules.keys():
 
 
 classes = [
-    operator.AddIfcFile,
     operator.BIM_OT_add_section_plane,
     operator.BIM_OT_delete_object,
     operator.BIM_OT_remove_section_plane,
+    operator.BIM_OT_select_entity,
+    operator.BIM_OT_select_entity_by_guid,
     operator.BIM_OT_select_object,
     operator.BIM_OT_show_description,
     operator.BIM_OT_multiple_file_selector,
+    operator.BIM_OT_attribute_add_subitem,
+    operator.BIM_OT_attribute_remove_subitem,
     operator.ClippingPlaneCutWithCappings,
     operator.CloseBlendWarning,
     operator.CloseError,
+    operator.CopyTextToClipboard,
     operator.EditBlenderCollection,
     operator.FileAssociate,
     operator.FileUnassociate,
+    operator.OpenPath,
     operator.OpenUpstream,
     operator.OpenUri,
     operator.ReloadIfcFile,
-    operator.RemoveIfcFile,
     operator.RevertClippingPlaneCut,
-    operator.SelectDataDir,
+    operator.SelectDir,
     operator.SelectIfcFile,
-    operator.SelectSchemaDir,
     operator.SelectURIAttribute,
     operator.SetTab,
     operator.SwitchTab,
+    operator.ShowSystemInfo,
     prop.StrProperty,
     operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
+    operator.BIM_OT_attribute_search_values,
     prop.ObjProperty,
     prop.MultipleFileSelect,
     prop.Attribute,
@@ -129,12 +136,13 @@ classes = [
     prop.BIMProperties,
     prop.IfcParameter,
     prop.PsetQto,
-    prop.GlobalId,
     prop.BIMObjectProperties,
     prop.BIMCollectionProperties,
     prop.BIMMeshProperties,
     prop.BIMFacet,
     prop.BIMFilterGroup,
+    prop.BIMSnapProperties,
+    prop.BIMSnapGroups,
     ui.BIM_UL_clipping_plane,
     ui.BIM_UL_generic,
     ui.BIM_UL_topics,
@@ -145,10 +153,10 @@ classes = [
     ui.BIM_PT_tab_new_project_wizard,
     ui.BIM_PT_tab_project_info,
     ui.BIM_PT_tab_spatial,
+    ui.BIM_PT_tab_grouping_and_filtering,
     ui.BIM_PT_tab_project_setup,
     ui.BIM_PT_tab_geometry,
     ui.BIM_PT_tab_stakeholders,
-    ui.BIM_PT_tab_grouping_and_filtering,
     # Object information
     ui.BIM_PT_tab_object_metadata,
     ui.BIM_PT_tab_misc,
@@ -190,6 +198,8 @@ classes = [
     # TODO: move this somewhere else and clean it up
     ui.BIM_PT_section_plane,
     ui.BIM_PT_section_with_cappings,
+    ui.BIM_PT_decorators_overlay,
+    ui.BIM_PT_snappping,
 ]
 
 for mod in modules.values():
@@ -215,13 +225,20 @@ def on_register(scene):
 
 def register():
     for cls in classes:
+        # Prevent crashes in Blender 4.4.0, see #6420.
+        if issubclass(cls, (ImportHelper, ExportHelper)):
+            assert getattr(cls, "bl_description", "") or cls.__doc__, cls
+
         bpy.utils.register_class(cls)
+
     bpy.app.handlers.depsgraph_update_post.append(on_register)
     bpy.app.handlers.undo_post.append(handler.undo_post)
     bpy.app.handlers.redo_post.append(handler.redo_post)
     bpy.app.handlers.load_post.append(handler.load_post)
     bpy.app.handlers.load_post.append(handler.loadIfcStore)
     bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
+    bpy.types.Scene.BIMSnapProperties = bpy.props.PointerProperty(type=prop.BIMSnapProperties)
+    bpy.types.Scene.BIMSnapGroups = bpy.props.PointerProperty(type=prop.BIMSnapGroups)
     bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
     bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
     bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
@@ -256,6 +273,12 @@ def register():
     icons = icon_preview
     bpy.app.translations.register("bonsai", translations_dict)
 
+    import bonsai.tool as tool
+
+    tool.Blender.ensure_bin_in_path()
+    # RestrictedContext doesn't allow accessing scene attribute, postpone it for a bit.
+    bpy.app.timers.register(tool.Blender.setup_user_data_dir, first_interval=0.1)
+
 
 def unregister():
     global icons

src/bonsai/bonsai/bim/data/assets/shading_styles.json

@@ -47,8 +47,6 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -147,7 +145,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.wireframe_color_type": "THEME",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -162,7 +160,6 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -189,7 +186,6 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -208,7 +204,6 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": false,
             "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,
@@ -298,8 +293,6 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -398,7 +391,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.wireframe_color_type": "THEME",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -413,7 +406,6 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -440,7 +432,6 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -459,7 +450,6 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": false,
             "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,
@@ -509,6 +499,10 @@
                 0.05087608844041824,
                 0.05087608844041824
             ],
+            "scene.eevee.use_shadows": true,
+            "scene.eevee.shadow_ray_count": 1,
+            "scene.eevee.shadow_step_count": 6,
+            "scene.eevee.shadow_resolution_scale": 1.0,
             "scene.render.bake_bias": 0.0010000000474974513,
             "scene.render.bake_margin": 16,
             "scene.render.bake_margin_type": "ADJACENT_FACES",
@@ -520,7 +514,7 @@
             "scene.render.border_min_x": 0.0,
             "scene.render.border_min_y": 0.0,
             "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_EEVEE",
+            "scene.render.engine": "BLENDER_EEVEE_NEXT",
             "scene.render.film_transparent": false,
             "scene.render.filter_size": 1.5,
             "scene.render.fps": 24,
@@ -549,8 +543,6 @@
             "scene.render.simplify_gpencil_shader_fx": true,
             "scene.render.simplify_gpencil_tint": true,
             "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
             "scene.render.simplify_subdivision": 6,
             "scene.render.simplify_subdivision_render": 6,
             "scene.render.simplify_volumes": 1.0,
@@ -649,7 +641,7 @@
             "scene.display.shading.use_scene_world_render": false,
             "scene.display.shading.use_studiolight_view_rotation": true,
             "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.wireframe_color_type": "THEME",
             "scene.display.shading.xray_alpha": 0.5,
             "scene.display.shading.xray_alpha_wireframe": 0.0,
             "scene.display.light_direction": [
@@ -664,7 +656,6 @@
             "scene.display.shadow_focus": 0.0,
             "scene.display.shadow_shift": 0.10000000149011612,
             "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
             "space.overlay.bone_wire_alpha": 1.0,
             "space.overlay.display_handle": "SELECTED",
             "space.overlay.fade_inactive_alpha": 0.4000000059604645,
@@ -691,7 +682,6 @@
             "space.overlay.show_edge_crease": true,
             "space.overlay.show_edge_seams": true,
             "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
             "space.overlay.show_extra_edge_angle": false,
             "space.overlay.show_extra_edge_length": false,
             "space.overlay.show_extra_face_angle": false,
@@ -710,7 +700,6 @@
             "space.overlay.show_motion_paths": true,
             "space.overlay.show_object_origins": true,
             "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
             "space.overlay.show_onion_skins": false,
             "space.overlay.show_ortho_grid": true,
             "space.overlay.show_outline_selected": true,

src/bonsai/bonsai/bim/data/brick/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!README.md

src/bonsai/bonsai/bim/data/brick/README.md

@@ -0,0 +1 @@
+This directory stores Brickschema definitions in TTL format.