openepd 6.11.0__py3-none-any.whl → 6.12.1__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.11.0"
+VERSION = "6.12.1"

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=None,
+        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=None,
+        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/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=None,
+        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=None,
+        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

{openepd-6.11.0.dist-info → openepd-6.12.1.dist-info}/METADATA

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

{openepd-6.11.0.dist-info → openepd-6.12.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=fhxfEyEurLvSfvQci-vb3njzl_lvhcLXiZrecCOaMU8,794
-openepd/__version__.py,sha256=EPnMDQ_1rPMeYJWPTBt_9ZD7s2EpB9owv1Sr_H_gWQo,639
+openepd/__version__.py,sha256=YzSSIKghgjH_RpO3Tffw6dYJf2wV2WNvVVEA1RJt70c,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=NpgJLs-wlsiR1hO5PRAY_0qIkfNqvBXJ50cqrZ4VJ-Y,5418
+openepd/model/specs/range/furnishings.py,sha256=7r9albaHmuf0ttqkSQ6elJcSzgFgOHSrwAfhEpJMm5k,6531
 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
@@ -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=68FKfEAmB4qS--diCUbwynm8a0gUzDXnpJlWrP9y9Ng,4345
+openepd/model/specs/singular/furnishings.py,sha256=6V6Dc4xph8PcIQhuuLFyFGL4w2Yh_ByEKCNvQfUkxZQ,5603
 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.11.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.11.0.dist-info/METADATA,sha256=FrHaoiG4BQIWO58OwMECaiNBXqyB0Js062qRuDz_owE,9039
-openepd-6.11.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.11.0.dist-info/RECORD,,
+openepd-6.12.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.12.1.dist-info/METADATA,sha256=SX0KqNw2vVhumIUbF9N9ASCXIuTigkSG1foQMtayHwc,9039
+openepd-6.12.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.12.1.dist-info/RECORD,,