openepd 6.10.0__tar.gz → 6.12.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.10.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.10.0 → openepd-6.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "6.10.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.10.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.10.0"
+VERSION = "6.12.0"

openepd-6.12.0/src/openepd/model/specs/range/furnishings.py

@@ -0,0 +1,255 @@
+#
+#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+__all__ = (
+    "DemountablePartitionTrackRangeV1",
+    "ChairsRangeV1",
+    "CountertopsRangeV1",
+    "DemountablePartitionsRangeV1",
+    "OtherFurnishingsRangeV1",
+    "OpenStorageRangeV1",
+    "ClosedStorageRangeV1",
+    "RetractableStorageRangeV1",
+    "MobileStorageRangeV1",
+    "WallMountedShelvingRangeV1",
+    "OtherStorageFurnitureRangeV1",
+    "StorageFurnitureRangeV1",
+    "TablesRangeV1",
+    "WorkSurfacesRangeV1",
+    "WorkspacesRangeV1",
+    "FurnishingsRangeV1",
+)
+
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
+
+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 AmountRangeAreaM2, AmountRangeLengthMm, AmountRangeVolume
+
+
+class DemountablePartitionTrackRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Track for modular partitions.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class ChairsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Chairs.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class CountertopsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Raised, flat, and horizontal surfaces often used in kitchens, bathrooms, and workrooms.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+    thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    countertop_material: list[CountertopMaterial] | None = pyd.Field(default=None, description="")
+
+
+class DemountablePartitionsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Demountable partitions.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+    DemountablePartitionTrack: DemountablePartitionTrackRangeV1 | None = None
+
+
+class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Other furnishings.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Open Storage.
+
+    Open Storage furniture which is static and has no moving parts.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Closed Storage.
+
+    Closed storage furniture making use of doors, sliding and/or hinged parts.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Retractable Storage.
+
+    Storage Furniture with retractable (drawer) elements.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Mobile Storage.
+
+    Mobile storage furniture having wheels or casters for movement.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WallMountedShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Wall Mounted Shelving.
+
+    Storage furniture which requires usage of a vertical structure for attachment and functional support.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Other Storage Furniture.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Storage Furniture.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.1"
+
+    OpenStorage: OpenStorageRangeV1 | None = None
+    ClosedStorage: ClosedStorageRangeV1 | None = None
+    RetractableStorage: RetractableStorageRangeV1 | None = None
+    MobileStorage: MobileStorageRangeV1 | None = None
+    WallMountedShelving: WallMountedShelvingRangeV1 | None = None
+    OtherStorageFurniture: OtherStorageFurnitureRangeV1 | None = None
+
+
+class TablesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Tables.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WorkSurfacesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Work surfaces.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WorkspacesRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Workspaces.
+
+    Office furniture and furniture systems for performing office work, such as cubicle systems.
+    Typically includes component(s) that may fit in other categories.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Home and office furnishings.
+
+    Range version.
+    """
+
+    _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
+    OtherFurnishings: OtherFurnishingsRangeV1 | None = None
+    StorageFurniture: StorageFurnitureRangeV1 | None = None
+    Tables: TablesRangeV1 | None = None
+    WorkSurfaces: WorkSurfacesRangeV1 | None = None
+    Workspaces: WorkspacesRangeV1 | None = None

{openepd-6.10.0 → openepd-6.12.0}/src/openepd/model/specs/range/steel.py

@@ -227,10 +227,12 @@ class StructuralSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     modulus_of_elasticity: AmountRangePressureMpa | None = pyd.Field(
-        default=None, description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus "
+        default=None,
+        description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus ",
     )
     thermal_expansion: AmountRangeThermalExpansion | None = pyd.Field(
-        default=None, description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion"
+        default=None,
+        description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion",
     )
     thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(
         default=None,
@@ -280,7 +282,8 @@ class RebarSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     diameter_min: AmountRangeLengthMm | None = pyd.Field(default=None, description="Minimal diameter")
     bending_pin_max: RangeFloat | None = pyd.Field(default=None)
     ts_ys_ratio_max: RangeFloat | None = pyd.Field(
-        default=None, description="Max ratio of ultimate tensile to yield tensile strength"
+        default=None,
+        description="Max ratio of ultimate tensile to yield tensile strength",
     )
     epoxy_coated: bool | None = pyd.Field(default=None)
 
@@ -297,6 +300,12 @@ class WireMeshSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     fabricated: bool | None = None
 
 
+class OtherSteelRangeV1(BaseOpenEpdHierarchicalSpec):
+    """Steel products that do not fit into a defined subcategory."""
+
+    _EXT_VERSION = "1.0"
+
+
 class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Broad category for construction materials made from steel and its alloys.
@@ -304,18 +313,20 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     yield_tensile_str: AmountRangePressureMpa | None = pyd.Field(
         default=None,
         description="Yield Tensile strength (Mpa) per unit area. Yield strength is the point at which a material begins to permanently deform or change shape due to applied stress.",
     )
     bar_elongation: RangeFloat | None = pyd.Field(
-        default=None, description="Increase in length at break, in percent. Typically 10%-20%"
+        default=None,
+        description="Increase in length at break, in percent. Typically 10%-20%",
     )
     recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="")
     post_consumer_recycled_content: RangeRatioFloat | None = pyd.Field(
-        default=None, description="Should be a number between zero and the Recycled Content (steel_recycled_content)"
+        default=None,
+        description="Should be a number between zero and the Recycled Content (steel_recycled_content)",
     )
     astm_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
     euro_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
@@ -335,3 +346,4 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     PostTensioningSteel: PostTensioningSteelRangeV1 | None = None
     RebarSteel: RebarSteelRangeV1 | None = None
     WireMeshSteel: WireMeshSteelRangeV1 | None = None
+    OtherSteel: OtherSteelRangeV1 | None = None

openepd-6.12.0/src/openepd/model/specs/singular/furnishings.py

@@ -0,0 +1,198 @@
+#
+#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+from openepd.compat.pydantic import pyd
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.enums import CountertopMaterial
+from openepd.model.validation.numbers import RatioFloat
+from openepd.model.validation.quantity import AreaM2Str, LengthMmStr, VolumeStr
+
+
+class DemountablePartitionTrackV1(BaseOpenEpdHierarchicalSpec):
+    """Track for modular partitions."""
+
+    _EXT_VERSION = "1.0"
+
+
+class ChairsV1(BaseOpenEpdHierarchicalSpec):
+    """Chairs."""
+
+    _EXT_VERSION = "1.0"
+
+
+class CountertopsV1(BaseOpenEpdHierarchicalSpec):
+    """Raised, flat, and horizontal surfaces often used in kitchens, bathrooms, and workrooms."""
+
+    _EXT_VERSION = "1.0"
+
+    # Own fields:
+    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="30 mm")
+    countertop_material: CountertopMaterial | None = pyd.Field(default=None, description="", example="Stone")
+
+
+class DemountablePartitionsV1(BaseOpenEpdHierarchicalSpec):
+    """Demountable partitions."""
+
+    _EXT_VERSION = "1.0"
+
+    # Nested specs:
+    DemountablePartitionTrack: DemountablePartitionTrackV1 | None = None
+
+
+class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
+    """Other furnishings."""
+
+    _EXT_VERSION = "1.0"
+
+
+class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Open Storage.
+
+    Open Storage furniture which is static and has no moving parts.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Closed Storage.
+
+    Closed storage furniture making use of doors, sliding and/or hinged parts.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Retractable Storage.
+
+    Storage Furniture with retractable (drawer) elements.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Mobile Storage.
+
+    Mobile storage furniture having wheels or casters for movement.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class WallMountedShelvingV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Wall Mounted Shelving.
+
+    Storage furniture which requires usage of a vertical structure for attachment and functional support.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class OtherStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
+    """Other Storage Furniture."""
+
+    _EXT_VERSION = "1.0"
+
+
+class StorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
+    """Storage Furniture."""
+
+    _EXT_VERSION = "1.1"
+
+    # Nested specs:
+    OpenStorage: OpenStorageV1 | None = None
+    ClosedStorage: ClosedStorageV1 | None = None
+    RetractableStorage: RetractableStorageV1 | None = None
+    MobileStorage: MobileStorageV1 | None = None
+    WallMountedShelving: WallMountedShelvingV1 | None = None
+    OtherStorageFurniture: OtherStorageFurnitureV1 | None = None
+
+
+class TablesV1(BaseOpenEpdHierarchicalSpec):
+    """Tables."""
+
+    _EXT_VERSION = "1.0"
+
+
+class WorkSurfacesV1(BaseOpenEpdHierarchicalSpec):
+    """Work surfaces."""
+
+    _EXT_VERSION = "1.0"
+
+
+class WorkspacesV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Workspaces.
+
+    Office furniture and furniture systems for performing office work, such as cubicle systems.
+    Typically includes component(s) that may fit in other categories.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
+    """Home and office furnishings."""
+
+    _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
+    DemountablePartitions: DemountablePartitionsV1 | None = None
+    OtherFurnishings: OtherFurnishingsV1 | None = None
+    StorageFurniture: StorageFurnitureV1 | None = None
+    Tables: TablesV1 | None = None
+    WorkSurfaces: WorkSurfacesV1 | None = None
+    Workspaces: WorkspacesV1 | None = None

openepd-6.10.0/src/openepd/model/specs/range/furnishings.py

@@ -1,137 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-__all__ = (
-    "DemountablePartitionTrackRangeV1",
-    "ChairsRangeV1",
-    "CountertopsRangeV1",
-    "DemountablePartitionsRangeV1",
-    "OtherFurnishingsRangeV1",
-    "StorageFurnitureRangeV1",
-    "TablesRangeV1",
-    "WorkSurfacesRangeV1",
-    "FurnishingsRangeV1",
-)
-
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
-
-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 AmountRangeLengthMm
-
-
-class DemountablePartitionTrackRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Track for modular partitions.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class ChairsRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Chairs.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class CountertopsRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Raised, flat, and horizontal surfaces often used in kitchens, bathrooms, and workrooms.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-    thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    countertop_material: list[CountertopMaterial] | None = pyd.Field(default=None, description="")
-
-
-class DemountablePartitionsRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Demountable partitions.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-    DemountablePartitionTrack: DemountablePartitionTrackRangeV1 | None = None
-
-
-class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Other furnishings.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Storage Furniture.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class TablesRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Tables.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class WorkSurfacesRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Work surfaces.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Home and office furnishings.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"
-
-    Chairs: ChairsRangeV1 | None = None
-    Countertops: CountertopsRangeV1 | None = None
-    DemountablePartitions: DemountablePartitionsRangeV1 | None = None
-    OtherFurnishings: OtherFurnishingsRangeV1 | None = None
-    StorageFurniture: StorageFurnitureRangeV1 | None = None
-    Tables: TablesRangeV1 | None = None
-    WorkSurfaces: WorkSurfacesRangeV1 | None = None