compas-timber 2.2.0__tar.gz → 3.0.0__tar.gz

{compas_timber-2.2.0/src/compas_timber.egg-info → compas_timber-3.0.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: compas_timber
-Version: 2.2.0
+Version: 3.0.0
 Summary: COMPAS package for modeling, designing and fabricating timber assemblies.
-Author-email: Aleksandra Anna Apolinarska <apolinarska@arch.ethz.ch>, Chen Kasirer <kasirer@arch.ethz.ch>, Gonzalo Casas <casas@arch.ethz.ch>, Jonas Haldemann <haldemann@arch.ethz.ch>, Oliver Appling Bucklin <bucklin@arch.ethz.ch>, "Aurèle L. Gheyselinck" <gheyselinck@arch.ethz.ch>, Panayiotis Papacharalambous <papacharalambous@arch.ethz.ch>, Anastasiia Stryzhevska <astryzhevska@arch.ethz.ch>, Jelle Feringa <jelleferinga@gmail.com>, Joseph Kenny <jk6372@princeton.edu>, Beverly Lytle <lytle@arch.ethz.ch>, Eric Gozzi <eric.gozzi@arch.ethz.ch>, Rodrigo Arca Zimmermann <rodrigo.arca@gmail.com>, Nicolas Benjamin Boscoboinik <boscoboinik@arch.ethz.ch>
+Author: Aleksandra Anna Apolinarska, Chen Kasirer, Gonzalo Casas, Jonas Haldemann, Oliver Appling Bucklin, Aurèle L. Gheyselinck, Panayiotis Papacharalambous, Anastasiia Stryzhevska, Jelle Feringa, Joseph Kenny, Beverly Lytle, Eric Gozzi, Rodrigo Arca Zimmermann, Nicolas Benjamin Boscoboinik, Paul Jaeggi, Matthias Helmreich, Daniel Nunes Locatelli
 License-Expression: MIT
 Project-URL: Homepage, https://gramaziokohler.github.io/compas_timber/latest/
 Project-URL: Repository, https://github.com/gramaziokohler/compas_timber
@@ -13,6 +13,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -20,9 +23,12 @@ Requires-Dist: rtree
 Requires-Dist: compas<3.0,>=2.15.1
 Requires-Dist: compas_model==0.9.2
 Requires-Dist: scipy>=1.1
+Requires-Dist: compas_brep>=0.3.1
+Requires-Dist: compas_pb<2.0,>=1.2.0
 Provides-Extra: dev
 Requires-Dist: bump-my-version; extra == "dev"
 Requires-Dist: compas_invocations2[mkdocs]>=1.0.2; extra == "dev"
+Requires-Dist: mkdocs-panzoom-plugin; extra == "dev"
 Requires-Dist: invoke>=0.14; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -34,15 +40,19 @@ Requires-Dist: tomlkit; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-randomly; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pyyaml; extra == "dev"
+Requires-Dist: compas_brep[occ]; extra == "dev"
 Provides-Extra: gh
 Requires-Dist: compas_invocations2; extra == "gh"
 Requires-Dist: tomlkit; extra == "gh"
 Requires-Dist: pythonnet; extra == "gh"
+Provides-Extra: viz
+Requires-Dist: compas_brep[occ]; extra == "viz"
+Requires-Dist: compas_viewer; extra == "viz"
 Dynamic: license-file
 
 <h1>
-  <img src="docs\_logo\PNG_tranparent-background.png" alt="Logo" width="70" height="70" style="vertical-align:middle"> 
-      COMPAS Timber
+  <img src="docs/_logo/PNG_tranparent-background.png" alt="COMPAS Timber logo" width="70" height="70" align="absmiddle"> COMPAS Timber
 </h1>
 
 
@@ -52,26 +62,44 @@ Dynamic: license-file
 [![pip downloads](https://img.shields.io/pypi/dm/compas_timber)](https://pypi.python.org/project/compas_timber)
 [![PyPI Package latest release](https://img.shields.io/pypi/v/compas_timber.svg)](https://pypi.python.org/pypi/compas_timber)
 [![Supported implementations](https://img.shields.io/pypi/implementation/compas_timber.svg)](https://pypi.python.org/pypi/compas_timber)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7934267.svg)](https://doi.org/10.5281/zenodo.7934267)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.7934266-blue)](https://doi.org/10.5281/zenodo.7934266)
 [![Twitter Follow](https://img.shields.io/twitter/follow/compas_dev?style=social)](https://twitter.com/compas_dev)
 [![Made with COMPAS](https://compas.dev/badge.svg)](https://compas.dev/#/)
 ![COMPAS Timber](https://raw.githubusercontent.com/gramaziokohler/compas_timber/main/docs/_images/compas_timber.jpg)
 
-`compas_timber` is a user-friendly open-source software toolkit to streamline the design of timber frame structures. Despite its advances in digitalization compared to other building techniques, timber construction is often perceived as a challenging field, involving intricate processes in design, planning, coordination, and fabrication. We aim to increase the use of timber in architecture by lowering the threshold of creating versatile and resource-aware designs.
+`compas_timber` is a user-friendly open-source software toolkit that streamlines the design-to-fabrication workflow of timber frame structures. A project is designed and refined in a single digital model that also produces the manufacturing data, so it can go from first concept to fabrication without re-modeling or back-and-forth rework along the way. By lowering the threshold for creating versatile and resource-aware timber designs, we aim to increase the use of timber in architecture.
 
 ## Installation
 
-> It is recomended you install `compas_timber` inside a virtual environment.
+We recommend managing environments and dependencies with [uv](https://docs.astral.sh/uv/), but a plain `pip install compas_timber` works just as well.
+
+Add `compas_timber` to your project:
+
+```bash
+uv add compas_timber
+```
+
+To visualize models outside of Rhino, install with the `viz` extra, which adds [compas_viewer](https://github.com/compas-dev/compas_viewer) and `compas_brep[occ]`:
+
+```bash
+uv add "compas_timber[viz]"
+```
+
+For a development setup, clone the repository and sync the environment:
 
 ```bash
-pip install compas_timber
+git clone https://github.com/gramaziokohler/compas_timber.git
+cd compas_timber
+uv sync --extra dev
+uv run pytest
 ```
 
 ## First Steps
 
 * [Documentation](https://gramaziokohler.github.io/compas_timber/)
-* [COMPAS TIMBER Grasshopper Tutorial](https://gramaziokohler.github.io/compas_timber/latest/tutorials.html)
-* [COMPAS TIMBER API Reference](https://gramaziokohler.github.io/compas_timber/latest/api.html)
+* [COMPAS TIMBER Grasshopper Plugin (timber_design)](https://github.com/gramaziokohler/timber_design)
+* [COMPAS TIMBER Grasshopper Tutorial](https://gramaziokohler.github.io/timber_design/)
+* [COMPAS TIMBER API Reference](https://gramaziokohler.github.io/compas_timber/latest/api/compas_timber.model/)
 
 ## Questions and feedback
 
@@ -86,9 +114,9 @@ If you found an issue or have a suggestion for a dandy new feature, please file
 
 We love contributions!
 
-Check the [Contributor's Guide](https://github.com/gramaziokohler/compas_timber/blob/main/CONTRIBUTING.md)
+Check the [Contributor's Guide](CONTRIBUTING.md)
 for more details.
 
 ## Credits
 
-`compas_timber` is currently developed by Gramazio Kohler Research. See the [list of authors](https://github.com/gramaziokohler/compas_timber/blob/main/AUTHORS.md) for a complete overview.
+`compas_timber` is currently developed by Gramazio Kohler Research. See [`CITATION.cff`](CITATION.cff) for a complete list of authors.

{compas_timber-2.2.0 → compas_timber-3.0.0}/README.md

@@ -1,6 +1,5 @@
 <h1>
-  <img src="docs\_logo\PNG_tranparent-background.png" alt="Logo" width="70" height="70" style="vertical-align:middle"> 
-      COMPAS Timber
+  <img src="docs/_logo/PNG_tranparent-background.png" alt="COMPAS Timber logo" width="70" height="70" align="absmiddle"> COMPAS Timber
 </h1>
 
 
@@ -10,26 +9,44 @@
 [![pip downloads](https://img.shields.io/pypi/dm/compas_timber)](https://pypi.python.org/project/compas_timber)
 [![PyPI Package latest release](https://img.shields.io/pypi/v/compas_timber.svg)](https://pypi.python.org/pypi/compas_timber)
 [![Supported implementations](https://img.shields.io/pypi/implementation/compas_timber.svg)](https://pypi.python.org/pypi/compas_timber)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7934267.svg)](https://doi.org/10.5281/zenodo.7934267)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.7934266-blue)](https://doi.org/10.5281/zenodo.7934266)
 [![Twitter Follow](https://img.shields.io/twitter/follow/compas_dev?style=social)](https://twitter.com/compas_dev)
 [![Made with COMPAS](https://compas.dev/badge.svg)](https://compas.dev/#/)
 ![COMPAS Timber](https://raw.githubusercontent.com/gramaziokohler/compas_timber/main/docs/_images/compas_timber.jpg)
 
-`compas_timber` is a user-friendly open-source software toolkit to streamline the design of timber frame structures. Despite its advances in digitalization compared to other building techniques, timber construction is often perceived as a challenging field, involving intricate processes in design, planning, coordination, and fabrication. We aim to increase the use of timber in architecture by lowering the threshold of creating versatile and resource-aware designs.
+`compas_timber` is a user-friendly open-source software toolkit that streamlines the design-to-fabrication workflow of timber frame structures. A project is designed and refined in a single digital model that also produces the manufacturing data, so it can go from first concept to fabrication without re-modeling or back-and-forth rework along the way. By lowering the threshold for creating versatile and resource-aware timber designs, we aim to increase the use of timber in architecture.
 
 ## Installation
 
-> It is recomended you install `compas_timber` inside a virtual environment.
+We recommend managing environments and dependencies with [uv](https://docs.astral.sh/uv/), but a plain `pip install compas_timber` works just as well.
+
+Add `compas_timber` to your project:
+
+```bash
+uv add compas_timber
+```
+
+To visualize models outside of Rhino, install with the `viz` extra, which adds [compas_viewer](https://github.com/compas-dev/compas_viewer) and `compas_brep[occ]`:
+
+```bash
+uv add "compas_timber[viz]"
+```
+
+For a development setup, clone the repository and sync the environment:
 
 ```bash
-pip install compas_timber
+git clone https://github.com/gramaziokohler/compas_timber.git
+cd compas_timber
+uv sync --extra dev
+uv run pytest
 ```
 
 ## First Steps
 
 * [Documentation](https://gramaziokohler.github.io/compas_timber/)
-* [COMPAS TIMBER Grasshopper Tutorial](https://gramaziokohler.github.io/compas_timber/latest/tutorials.html)
-* [COMPAS TIMBER API Reference](https://gramaziokohler.github.io/compas_timber/latest/api.html)
+* [COMPAS TIMBER Grasshopper Plugin (timber_design)](https://github.com/gramaziokohler/timber_design)
+* [COMPAS TIMBER Grasshopper Tutorial](https://gramaziokohler.github.io/timber_design/)
+* [COMPAS TIMBER API Reference](https://gramaziokohler.github.io/compas_timber/latest/api/compas_timber.model/)
 
 ## Questions and feedback
 
@@ -44,9 +61,9 @@ If you found an issue or have a suggestion for a dandy new feature, please file
 
 We love contributions!
 
-Check the [Contributor's Guide](https://github.com/gramaziokohler/compas_timber/blob/main/CONTRIBUTING.md)
+Check the [Contributor's Guide](CONTRIBUTING.md)
 for more details.
 
 ## Credits
 
-`compas_timber` is currently developed by Gramazio Kohler Research. See the [list of authors](https://github.com/gramaziokohler/compas_timber/blob/main/AUTHORS.md) for a complete overview.
+`compas_timber` is currently developed by Gramazio Kohler Research. See [`CITATION.cff`](CITATION.cff) for a complete list of authors.

{compas_timber-2.2.0 → compas_timber-3.0.0}/pyproject.toml

@@ -6,20 +6,23 @@
 name = "compas_timber"
 description = "COMPAS package for modeling, designing and fabricating timber assemblies."
 authors = [
-    { name = "Aleksandra Anna Apolinarska", email = "apolinarska@arch.ethz.ch" },
-    { name = "Chen Kasirer", email = "kasirer@arch.ethz.ch" },
-    { name = "Gonzalo Casas", email = "casas@arch.ethz.ch" },
-    { name = "Jonas Haldemann", email = "haldemann@arch.ethz.ch" },
-    { name = "Oliver Appling Bucklin", email = "bucklin@arch.ethz.ch" },
-    { name = "Aurèle L. Gheyselinck", email = "gheyselinck@arch.ethz.ch" },
-    { name = "Panayiotis Papacharalambous", email = "papacharalambous@arch.ethz.ch" },
-    { name = "Anastasiia Stryzhevska", email = "astryzhevska@arch.ethz.ch" },
-    { name = "Jelle Feringa", email = "jelleferinga@gmail.com" },
-    { name = "Joseph Kenny", email = "jk6372@princeton.edu" },
-    { name = "Beverly Lytle", email = "lytle@arch.ethz.ch" },
-    { name = "Eric Gozzi", email = "eric.gozzi@arch.ethz.ch" },
-    { name = "Rodrigo Arca Zimmermann", email = "rodrigo.arca@gmail.com" },
-    { name = "Nicolas Benjamin Boscoboinik", email = "boscoboinik@arch.ethz.ch" }
+    {name = "Aleksandra Anna Apolinarska"},
+    {name = "Chen Kasirer"},
+    {name = "Gonzalo Casas"},
+    {name = "Jonas Haldemann"},
+    {name = "Oliver Appling Bucklin"},
+    {name = "Aurèle L. Gheyselinck"},
+    {name = "Panayiotis Papacharalambous"},
+    {name = "Anastasiia Stryzhevska"},
+    {name = "Jelle Feringa"},
+    {name = "Joseph Kenny"},
+    {name = "Beverly Lytle"},
+    {name = "Eric Gozzi"},
+    {name = "Rodrigo Arca Zimmermann"},
+    {name = "Nicolas Benjamin Boscoboinik"},
+    {name = "Paul Jaeggi"},
+    {name = "Matthias Helmreich"},
+    {name = "Daniel Nunes Locatelli"},
 ]
 license = "MIT"
 readme = "README.md"
@@ -33,19 +36,25 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 dependencies = [
     "rtree",
     "compas >=2.15.1, <3.0",
     "compas_model == 0.9.2", # pin until first release
-    "scipy >= 1.1"
+    "scipy >= 1.1",
+    "compas_brep >= 0.3.1",
+    "compas_pb >= 1.2.0, < 2.0",
 ]
 
 [project.optional-dependencies]
 dev = [
     "bump-my-version",
     "compas_invocations2[mkdocs]>=1.0.2",
+    "mkdocs-panzoom-plugin",
     "invoke >=0.14",
     "ruff",
     "twine",
@@ -57,6 +66,8 @@ dev = [
     "pytest-cov",
     "pytest-randomly",
     "pre-commit",
+    "pyyaml",
+    "compas_brep[occ]"
 ]
 
 gh = [
@@ -65,15 +76,23 @@ gh = [
     "pythonnet",
 ]
 
+viz = [
+    "compas_brep[occ]",
+    "compas_viewer"
+]
+
 [project.urls]
 Homepage = "https://gramaziokohler.github.io/compas_timber/latest/"
 Repository = "https://github.com/gramaziokohler/compas_timber"
 
+[project.entry-points.'compas_pb.plugins']
+serializers = 'compas_timber.proto.conversions'
+
 # ============================================================================
 # Setup and build
 # ============================================================================
 [build-system]
-requires = ["setuptools>=68", "wheel"]
+requires = ["setuptools>=68", "wheel", "compas_pb >= 1.2.0, < 2.0", "grpcio-tools"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
@@ -83,42 +102,25 @@ zip-safe = false
 
 [tool.setuptools.dynamic]
 version = { attr = "compas_timber.__version__" }
-dependencies = { file = "requirements.txt" }
-optional-dependencies = { dev = { file = "requirements-dev.txt" } }
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.setuptools.package-data]
+"compas_timber.fabrication" = ["basic_characters.zip"]
 
 # ============================================================================
 # Release
 # ============================================================================
 
+# `release-pr` bumps the version and `release-check` validates it; both support
+# stable semantic versions only, and both drive the commit/tag through the
+# release pull request rather than through bump-my-version.
 [tool.bumpversion]
-current_version = "2.2.0"
+current_version = "3.0.0"
 message = "Bump version to {new_version}"
-commit = true
-tag = true
-parse = """(?x)
-    (?P<major>0|[1-9]\\d*)\\.
-    (?P<minor>0|[1-9]\\d*)\\.
-    (?P<patch>0|[1-9]\\d*)
-    (?:
-        -                             # dash separator for pre-release section
-        (?P<pre_l>[a-zA-Z-]+)         # pre-release label
-        (?P<pre_n>0|[1-9]\\d*)        # pre-release version number
-    )?                                # pre-release section is optional
-"""
-serialize = [
-    "{major}.{minor}.{patch}-{pre_l}{pre_n}",
-    "{major}.{minor}.{patch}",
-]
-
-[tool.bumpversion.parts.pre_l]
-values = ["dev", "rc", "final"]
-optional_value = "final"
-first_value = "final"
+commit = false
+tag = false
 
 [[tool.bumpversion.files]]
 filename = "src/compas_timber/__init__.py"
@@ -153,6 +155,9 @@ forced_separate = "test_compas_timber"
 line-length = 179
 indent-width = 4
 target-version = "py39"
+# protoc-generated modules are not authored by hand and are regenerated by
+# `invoke pre_build`; linting them makes `invoke lint` fail in CI.
+extend-exclude = ["*_pb2.py", "*_pb2.pyi"]
 
 [tool.ruff.lint]
 select = ["E", "F", "I"]
@@ -192,3 +197,6 @@ python_files = [
 addopts = "-ra --strict --doctest-modules --doctest-glob=*.rst --tb=short"
 doctest_optionflags= "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES NUMBER"
 filterwarnings = "ignore::DeprecationWarning"
+markers = [
+    "requires_occ: marks tests that need the OCC Brep backend, which is not available on Python 3.9",
+]

{compas_timber-2.2.0 → compas_timber-3.0.0}/src/compas_timber/__init__.py

@@ -1,7 +1,7 @@
 import os
 import compas
 
-__version__ = "2.2.0"
+__version__ = "3.0.0"
 
 HERE = os.path.dirname(__file__)
 HOME = os.path.abspath(os.path.join(HERE, "..", ".."))

{compas_timber-2.2.0 → compas_timber-3.0.0}/src/compas_timber/base.py

@@ -1,5 +1,4 @@
 import abc
-from functools import wraps
 
 from compas.geometry import Frame
 from compas.geometry import Line
@@ -7,21 +6,42 @@ from compas.geometry import PlanarSurface
 from compas.geometry import Transformation
 from compas.geometry import Vector
 from compas_model.elements import Element
-from compas_model.elements import reset_computed
 
+# Cached attributes, in two tiers. Element classes extend these with their own in class attributes of the same name.
+# Element tier: derived from the element's own data (its geometry, features, transformation).
+ELEMENT_CACHE = ("_elementgeometry",)
+# Model tier: derived from the element's placement in the model, i.e. also from its ancestors' transformations.
+MODEL_CACHE = ("_modeltransformation", "_modelgeometry", "_aabb", "_obb", "_collision_mesh", "_point", "_surface_mesh", "_volumetric_mesh")
 
-def reset_timber_attrs(f):
-    """Decorator to reset cached timber-specific attributes."""
 
-    @wraps(f)
-    def wrapper(*args, **kwargs):
-        self: TimberElement = args[0]
-        self._blank = None
-        self._ref_frame = None
-        self._geometry = None  # from Element
-        return f(*args, **kwargs)
+def clear_element_cache(element):
+    """Clear the cached data of `element` after its own data changed (geometry, features, transformation).
+
+    Its model-space data is derived from it, so this also calls :func:`clear_model_cache`.
+
+    Parameters
+    ----------
+    element : :class:`compas_model.elements.Element`
+
+    """
+    for name in getattr(element, "ELEMENT_CACHE", ELEMENT_CACHE):
+        setattr(element, name, None)
+    clear_model_cache(element)
+
+
+def clear_model_cache(element):
+    """Clear the cached model-space data of `element` and of all its descendants, after its placement changed.
+
+    The descendants' placement is composed from `element`'s, so their model-space data is cleared too.
+
+    Parameters
+    ----------
+    element : :class:`compas_model.elements.Element`
 
-    return wrapper
+    """
+    for e in [node.element for node in element.treenode.traverse()] if element.treenode else [element]:
+        for name in getattr(e, "MODEL_CACHE", MODEL_CACHE):
+            setattr(e, name, None)
 
 
 class TimberElement(Element, abc.ABC):
@@ -63,10 +83,16 @@ class TimberElement(Element, abc.ABC):
 
     """
 
+    MODEL_CACHE = MODEL_CACHE + ("_blank", "_ref_frame", "_geometry")
+
     @property
     def __data__(self):
         data = {}
-        data["frame"] = self.frame
+        # not `self.frame`: that is `Frame.from_transformation(self.modeltransformation)`, the world-composed
+        # frame with the whole ancestor chain baked in. The constructor treats `frame` as `self.transformation`,
+        # the *local*, parent-relative placement - so for a nested element (a child of another element in the
+        # model tree), storing the world frame would double-apply the ancestor's transformation on deserialization.
+        data["frame"] = Frame.from_transformation(self.transformation)
         data["length"] = self.length
         data["width"] = self.width
         data["height"] = self.height
@@ -85,31 +111,6 @@ class TimberElement(Element, abc.ABC):
         self._ref_frame = None
         self.debug_info = []
 
-    @reset_computed
-    @reset_timber_attrs
-    def _reset_computed_dummy(self):
-        """Dummy method to trigger reset_computed decorator."""
-        pass
-
-    def reset_computed_properties(self):
-        """Reset all computed/cached properties."""
-        self._reset_computed_dummy()
-
-    def clear_model_dependent_cache(self):
-        """Clear cached attributes that depend on the element's position in the model hierarchy.
-
-        Preserves model-independent caches such as ``_elementgeometry``, features,
-        and blank extensions.
-        """
-        self._modeltransformation = None
-        self._modelgeometry = None
-        self._aabb = None
-        self._obb = None
-        self._collision_mesh = None
-        self._blank = None
-        self._ref_frame = None
-        self._geometry = None
-
     @property
     def is_beam(self):
         return False
@@ -129,14 +130,15 @@ class TimberElement(Element, abc.ABC):
         return self._features
 
     @features.setter
-    @reset_computed
     def features(self, features):
         self._features = features
+        clear_element_cache(self)
 
-    @reset_timber_attrs
-    def transform(self, transformation):
-        # override to reset timber-specific cached attributes
-        super().transform(transformation)
+    @Element.transformation.setter
+    def transformation(self, transformation):
+        # `Element.transform()` goes through here too
+        self._transformation = transformation
+        clear_element_cache(self)
 
     @property
     def geometry(self):
@@ -178,25 +180,21 @@ class TimberElement(Element, abc.ABC):
         self.remove_blank_extension()
         self.debug_info = []
 
-    @reset_computed
-    @reset_timber_attrs
     def add_feature(self, feature):
         # type: (BTLxProcessing) -> None
-        """Adds one or more features to the beam.
+        """Adds a feature to the element.
 
         Parameters
         ----------
-        feature : :class:`~compas_timber.fabrication.BTLxProcessing`)
+        feature : :class:`~compas_timber.fabrication.BTLxProcessing`
             The feature to be added.
 
         """
-        self._features.append(feature)  # type: ignore
+        self.add_features(feature)
 
-    @reset_computed
-    @reset_timber_attrs
     def add_features(self, features):
         # type: (BTLxProcessing | list[BTLxProcessing]) -> None
-        """Adds one or more features to the beam.
+        """Adds one or more features to the element.
 
         Parameters
         ----------
@@ -204,15 +202,14 @@ class TimberElement(Element, abc.ABC):
             The feature or features to be added described as a BTLxProcessing or a list of BTLxProcessings.
 
         """
+        clear_element_cache(self)
         if not isinstance(features, list):
             features = [features]
         self._features.extend(features)  # type: ignore
 
-    @reset_computed
-    @reset_timber_attrs
     def remove_features(self, features=None):
         # type: (None | BTLxProcessing | list[BTLxProcessing]) -> None
-        """Removes a feature from the beam.
+        """Removes one or more features from the element.
 
         Parameters
         ----------
@@ -221,6 +218,7 @@ class TimberElement(Element, abc.ABC):
             If None, all features will be removed.
 
         """
+        clear_element_cache(self)
         if features is None:
             self._features = []
         else:

{compas_timber-2.2.0 → compas_timber-3.0.0}/src/compas_timber/connections/__init__.py

@@ -4,7 +4,6 @@ from .i_simple_scarf import ISimpleScarf
 from .l_butt import LButtJoint
 from .l_lap import LLapJoint
 from .l_miter import LMiterJoint
-from .l_miter import MiterPlaneSpec
 from .l_french_ridge_lap import LFrenchRidgeLapJoint
 from .lap_joint import LapJoint
 from .joint_candidate import JointCandidate
@@ -13,6 +12,7 @@ from .solver import ConnectionSolver
 from .solver import PlateConnectionSolver
 from .solver import JointTopology
 from .solver import find_neighboring_elements
+from .candidate_dispatch import get_connection_candidate
 from .t_butt import TButtJoint
 from .t_step_joint import TStepJoint
 from .t_birdsmouth import TBirdsmouthJoint
@@ -40,8 +40,11 @@ from .plate_miter_joint import PlateMiterJoint
 from .panel_butt_joint import PanelLButtJoint
 from .panel_butt_joint import PanelTButtJoint
 from .panel_miter_joint import PanelMiterJoint
+from .panel_layer_butt_joint import PanelLLayerButtJoint
 from .cluster import Cluster
 from .cluster import get_clusters_from_joint_candidates
+from .cluster import get_topology_from_joints
+from .composite_joint import CompositeJoint
 
 
 __all__ = [
@@ -66,6 +69,7 @@ __all__ = [
     "ConnectionSolver",
     "PlateConnectionSolver",
     "find_neighboring_elements",
+    "get_connection_candidate",
     "TDovetailJoint",
     "MortiseTenonJoint",
     "BallNodeJoint",
@@ -74,7 +78,6 @@ __all__ = [
     "YButtJoint",
     "TOliGinaJoint",
     "CutPlaneSpec",
-    "MiterPlaneSpec",
     "beam_ref_side_incidence",
     "beam_ref_side_incidence_with_vector",
     "point_centerline_towards_joint",
@@ -89,6 +92,9 @@ __all__ = [
     "PanelLButtJoint",
     "PanelTButtJoint",
     "PanelMiterJoint",
+    "PanelLLayerButtJoint",
     "Cluster",
     "get_clusters_from_joint_candidates",
+    "get_topology_from_joints",
+    "CompositeJoint",
 ]

{compas_timber-2.2.0 → compas_timber-3.0.0}/src/compas_timber/connections/ball_node.py

@@ -131,4 +131,6 @@ class BallNodeJoint(Joint):
             pt = beam.centerline.closest_point(self._node_point)
             interface.frame = Frame(pt, Vector.from_start_end(pt, beam.centerline.midpoint), beam.frame.zaxis)
             self.fastener.interfaces.append(interface)
-            beam.add_features(interface.get_features(beam))
+            features = interface.get_features(beam)
+            beam.add_features(features)
+            self.features.extend(features)