openepd 6.10.0__py3-none-any.whl → 6.12.0__py3-none-any.whl

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/model/specs/range/furnishings.py

@@ -19,9 +19,16 @@ __all__ = (
     "CountertopsRangeV1",
     "DemountablePartitionsRangeV1",
     "OtherFurnishingsRangeV1",
+    "OpenStorageRangeV1",
+    "ClosedStorageRangeV1",
+    "RetractableStorageRangeV1",
+    "MobileStorageRangeV1",
+    "WallMountedShelvingRangeV1",
+    "OtherStorageFurnitureRangeV1",
     "StorageFurnitureRangeV1",
     "TablesRangeV1",
     "WorkSurfacesRangeV1",
+    "WorkspacesRangeV1",
     "FurnishingsRangeV1",
 )
 
@@ -29,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):
@@ -89,6 +97,76 @@ class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     _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.
@@ -96,7 +174,14 @@ class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _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):
@@ -119,15 +204,47 @@ class WorkSurfacesRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
+class WorkspacesRangeV1(BaseOpenEpdHierarchicalSpec):
     """
-    Home and office furnishings.
+    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
@@ -135,3 +252,4 @@ class FurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     StorageFurniture: StorageFurnitureRangeV1 | None = None
     Tables: TablesRangeV1 | None = None
     WorkSurfaces: WorkSurfacesRangeV1 | None = None
+    Workspaces: WorkspacesRangeV1 | None = None

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/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):
@@ -56,10 +57,74 @@ class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _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.0"
+    _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):
@@ -74,10 +139,53 @@ class WorkSurfacesV1(BaseOpenEpdHierarchicalSpec):
     _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.0"
+    _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
@@ -87,3 +195,4 @@ class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
     StorageFurniture: StorageFurnitureV1 | None = None
     Tables: TablesV1 | None = None
     WorkSurfaces: WorkSurfacesV1 | None = None
+    Workspaces: WorkspacesV1 | None = None

{openepd-6.10.0.dist-info → openepd-6.12.0.dist-info}/METADATA

@@ -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.dist-info → openepd-6.12.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=fhxfEyEurLvSfvQci-vb3njzl_lvhcLXiZrecCOaMU8,794
-openepd/__version__.py,sha256=P7KbPI_bIG44qmSxX1ozUeZjbKw79GTlCFyHnxUs3xA,639
+openepd/__version__.py,sha256=4igRnJ4prO4O--ghi78JXsgSz4xobA4SHm1zlb0MpHU,639
 openepd/api/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=KHCmSKMOJTQct6vhdhAatAENoouStc_yVRza5AFNoIo,7953
@@ -67,7 +67,7 @@ openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,
 openepd/model/specs/range/electricity.py,sha256=yn_S25C_tZqseb8hiJ1yiHszu2mQ49FOFWWCqNpOBY0,997
 openepd/model/specs/range/finishes.py,sha256=oCaPVYJja1KYxwEzTHCl7HtxQ2mokzeyahjyP33zHSg,21291
 openepd/model/specs/range/fire_and_smoke_protection.py,sha256=u5veICQznf-woYlh49S_IbvPA23CLWEy7Ngvic2FIpw,3337
-openepd/model/specs/range/furnishings.py,sha256=aFYzyNm8F5dYYN0fqjiEEvxanvd5vzZNdP3_r4FK_e8,3234
+openepd/model/specs/range/furnishings.py,sha256=Es3rPvWT1opiMtyp7PdzKLe74pFRgs1jkROU51AoNDA,6528
 openepd/model/specs/range/grouting.py,sha256=BQPxH6BvlXpdhLEZBui9zTuY93K_9syjoa6rdnF8GGY,1095
 openepd/model/specs/range/manufacturing_inputs.py,sha256=xzgkNz7yG8cp715hxS0LtJX9nfJ5RQR8GxlD2bAduwE,5574
 openepd/model/specs/range/masonry.py,sha256=IyjQMb8Mx3tpJlHIIam0OrMkFsJXKvc0WXRLRBupozY,2867
@@ -81,7 +81,7 @@ openepd/model/specs/range/other_materials.py,sha256=k7Gv6YvWy43B-QFBabBt-TkvkC45
 openepd/model/specs/range/plumbing.py,sha256=RYfP6ail7cYrwBluxmbAkC9icbxXaxdrdnf4Vqhy9ho,5342
 openepd/model/specs/range/precast_concrete.py,sha256=hXnljuc6djoScmx50ZWkmVjnihCTjiZV755aaKCs6uA,3763
 openepd/model/specs/range/sheathing.py,sha256=tATL6dzKTdN0rUKZRzZd779dLhKdEavL5Bjybnt2MjU,3395
-openepd/model/specs/range/steel.py,sha256=pO6EhAkqtTOW-f4qFyrbp4XB7VAY-PZMzACvDysDY6E,10173
+openepd/model/specs/range/steel.py,sha256=tPRtWSqhVjmbbWVFoFpS7rQKDsaYn9D_6afBOYhqPug,10417
 openepd/model/specs/range/thermal_moisture_protection.py,sha256=WOyUzR_t39mpekg1vOrU9e529DyR1EPM0h3QAP46kdc,9409
 openepd/model/specs/range/utility_piping.py,sha256=mQTrKbMTES_0Yta9DBnKehsmA2BAN_zYF_uPZCTKLPo,2665
 openepd/model/specs/range/wood.py,sha256=1ZAkUwcFF9etc7CZ1_BSvjchpnqnngfZihYZMtuLdeM,6946
@@ -106,7 +106,7 @@ openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.
 openepd/model/specs/singular/electricity.py,sha256=f1cJ9eklNUf97khCIZiT5-z8V_TbOcvH2me_1UTQVrE,823
 openepd/model/specs/singular/finishes.py,sha256=bAlNZiUP-HwePaJyC1D4j2fpv0xnMp3V5mhtAs9iaxQ,22571
 openepd/model/specs/singular/fire_and_smoke_protection.py,sha256=1uyEGdMAsboYORHvSFN1wftRVAps_UJ1Ep3Dk9arT3s,3058
-openepd/model/specs/singular/furnishings.py,sha256=I02FHxBbaaxJ_qATnK9sQdPwIEBalCOKie_ZkuD3uhk,2571
+openepd/model/specs/singular/furnishings.py,sha256=rogO5XZl1341xPnVMQ1CSIcLiKbh66ZqmXXXR_em0MA,5600
 openepd/model/specs/singular/grouting.py,sha256=pg2tX3W7a2TQ3z_eyFYGlBJY3WEwn6JlZyqM3PQIJcU,934
 openepd/model/specs/singular/manufacturing_inputs.py,sha256=9WSDOVN0mUqvFXqWf82lkpHi-XRQSMcEpe9bweegwhU,5093
 openepd/model/specs/singular/masonry.py,sha256=f6nph-gscAmVeJ60bG-ebto5kz0fgh0LY27n0VutGFA,3165
@@ -136,7 +136,7 @@ openepd/model/validation/quantity.py,sha256=vfSe-3DGQf84bCp_sMIU0ZPAA1wIilodpTjL
 openepd/model/versioning.py,sha256=cm3LaAUODnbbu3W3pC6baJzxKusTQ1kZH-PwwScCj3c,4473
 openepd/patch_pydantic.py,sha256=LVqDMKn723VYYf_V-RgTLxIb1xiUtYOfPYCQP6-7RoM,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.10.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.10.0.dist-info/METADATA,sha256=0jcojDvqr4uDMoLwc8_LoAx9nIfWmwpcPKpGIbY99EM,9039
-openepd-6.10.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.10.0.dist-info/RECORD,,
+openepd-6.12.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.12.0.dist-info/METADATA,sha256=S3MymGCa7n1SY6ew2g3Z4LRvO0z462bqjgdBTQRuym8,9039
+openepd-6.12.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.12.0.dist-info/RECORD,,