openepd 6.11.0__tar.gz → 6.12.0__tar.gz

{openepd-6.11.0 → openepd-6.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.11.0
+Version: 6.12.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0

{openepd-6.11.0 → openepd-6.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "6.11.0"
+version = "6.12.0"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]

{openepd-6.11.0 → openepd-6.12.0}/src/openepd/__version__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-VERSION = "6.11.0"
+VERSION = "6.12.0"

{openepd-6.11.0 → openepd-6.12.0}/src/openepd/model/specs/range/furnishings.py

@@ -36,9 +36,10 @@ __all__ = (
 
 
 from openepd.compat.pydantic import pyd
+from openepd.model.common import RangeInt, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CountertopMaterial
-from openepd.model.validation.quantity import AmountRangeLengthMm
+from openepd.model.validation.quantity import AmountRangeAreaM2, AmountRangeLengthMm, AmountRangeVolume
 
 
 class DemountablePartitionTrackRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -225,6 +226,25 @@ class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
+    functional_floor_area_m2: AmountRangeAreaM2 | None = pyd.Field(
+        default=None, title="Functional Floor Area", description="The floor area that the product occupies."
+    )
+    work_surface_area_m2: AmountRangeAreaM2 | None = pyd.Field(
+        default=None, title="Work Surface Area", description="The usable work surface area that the product provides."
+    )
+    functional_storage_volume_m3: AmountRangeVolume | None = pyd.Field(
+        default=None, title="Functional Storage Volume", description=""
+    )
+    functional_seating_capacity: RangeInt | None = pyd.Field(
+        default=1,
+        title="Functional Seating Capacity",
+        description="Intended number of individuals the product seats. This value is used in calculating impact per functional unit.",
+    )
+    installation_waste_factor: RangeRatioFloat | None = pyd.Field(
+        default=0.01,
+        title="Installation Waste Factor",
+        description="Typical increase in impacts to account for installation waste.",
+    )
     Chairs: ChairsRangeV1 | None = None
     Countertops: CountertopsRangeV1 | None = None
     DemountablePartitions: DemountablePartitionsRangeV1 | None = None

{openepd-6.11.0 → openepd-6.12.0}/src/openepd/model/specs/singular/furnishings.py

@@ -16,7 +16,8 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CountertopMaterial
-from openepd.model.validation.quantity import LengthMmStr
+from openepd.model.validation.numbers import RatioFloat
+from openepd.model.validation.quantity import AreaM2Str, LengthMmStr, VolumeStr
 
 
 class DemountablePartitionTrackV1(BaseOpenEpdHierarchicalSpec):
@@ -154,6 +155,38 @@ class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
+    # Own fields:
+    functional_floor_area_m2: AreaM2Str | None = pyd.Field(
+        default=None,
+        title="Functional Floor Area",
+        description="The floor area that the product occupies.",
+        example="1 m2",
+    )
+    work_surface_area_m2: AreaM2Str | None = pyd.Field(
+        default=None,
+        title="Work Surface Area",
+        description="The usable work surface area that the product provides.",
+        example="1 m2",
+    )
+    functional_storage_volume_m3: VolumeStr | None = pyd.Field(
+        default=None,
+        title="Functional Storage Volume",
+        description="",
+        example="1 m3",
+    )
+    functional_seating_capacity: pyd.NonNegativeInt | None = pyd.Field(
+        default=1,
+        title="Functional Seating Capacity",
+        description="Intended number of individuals the product seats. This value is used in calculating impact per functional unit.",
+        example=1,
+    )
+    installation_waste_factor: RatioFloat | None = pyd.Field(
+        default=0.01,
+        title="Installation Waste Factor",
+        description="Typical increase in impacts to account for installation waste.",
+        example=0.01,
+    )
+
     # Nested specs:
     Chairs: ChairsV1 | None = None
     Countertops: CountertopsV1 | None = None