openepd 6.17.0__tar.gz → 6.18.0__tar.gz

{openepd-6.17.0 → openepd-6.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openepd
-Version: 6.17.0
+Version: 6.18.0
 Summary: Python library to work with OpenEPD format
 License: Apache-2.0
 Author: C-Change Labs

{openepd-6.17.0 → openepd-6.18.0}/pyproject.toml

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

{openepd-6.17.0 → openepd-6.18.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.17.0"
+VERSION = "6.18.0"

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/range/__init__.py

@@ -33,7 +33,7 @@ from .conveying_equipment import ConveyingEquipmentRangeV1
 from .electrical import ElectricalRangeV1
 from .electrical_transmission_and_distribution_equipment import ElectricalTransmissionAndDistributionEquipmentRangeV1
 from .electricity import ElectricityRangeV1
-from .exterior_improvements import ExteriorImprovementsV1
+from .exterior_improvements import ExteriorImprovementsRangeV1
 from .finishes import FinishesRangeV1
 from .fire_and_smoke_protection import FireAndSmokeProtectionRangeV1
 from .furnishings import FurnishingsRangeV1
@@ -100,4 +100,4 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     MechanicalInsulation: MechanicalInsulationRangeV1 | None = None
     OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = None
     WoodJoists: WoodJoistsRangeV1 | None = None
-    ExteriorImprovements: ExteriorImprovementsV1 | None = None
+    ExteriorImprovements: ExteriorImprovementsRangeV1 | None = None

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/range/exterior_improvements.py

@@ -18,7 +18,7 @@ from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.quantity import AmountRangePressureMpa
 
 
-class ConcretePaversV1(BaseOpenEpdHierarchicalSpec):
+class ConcretePaversRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Segmental units of concrete of standardized sizes and shapes for use in paving applications.
 
@@ -38,9 +38,9 @@ class ConcretePaversV1(BaseOpenEpdHierarchicalSpec):
     white_cement: bool | None = pyd.Field(default=None, description="CMU using some portion of white cement")
 
 
-class ExteriorImprovementsV1(BaseOpenEpdHierarchicalSpec):
+class ExteriorImprovementsRangeV1(BaseOpenEpdHierarchicalSpec):
     """Products that alter the exterior appearance of a lot or its structures."""
 
     _EXT_VERSION = "1.0"
 
-    ConcretePavers: ConcretePaversV1 | None = None
+    ConcretePavers: ConcretePaversRangeV1 | None = None

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/range/finishes.py

@@ -50,10 +50,6 @@ from openepd.model.common import RangeAmount, RangeFloat, RangeInt, RangeRatioFl
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
-    AccessFlooringCoreMaterial,
-    AccessFlooringFinishMaterial,
-    AccessFlooringSeismicRating,
-    AccessFlooringStringers,
     AllFabrication,
     CarpetFormFactor,
     CarpetIntendedApplication,
@@ -76,17 +72,16 @@ from openepd.model.specs.enums import (
     WoodFlooringFabrication,
     WoodFlooringTimberSpecies,
 )
+from openepd.model.specs.range.mixins.access_flooring_mixin import AccessFlooringRangeMixin
 from openepd.model.validation.quantity import (
-    AmountRangeForce,
     AmountRangeGWP,
     AmountRangeLengthMm,
-    AmountRangePressureMpa,
     AmountRangeRFactor,
     AmountRangeYarnWeight,
 )
 
 
-class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
+class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec, AccessFlooringRangeMixin):
     """
     Elevated floor system built on top of concrete slab surface.
 
@@ -98,22 +93,6 @@ class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    core_material: list[AccessFlooringCoreMaterial] | None = pyd.Field(default=None, description="")
-    finish_material: list[AccessFlooringFinishMaterial] | None = pyd.Field(default=None, description="")
-    stringers: list[AccessFlooringStringers] | None = pyd.Field(default=None, description="")
-    seismic_rating: list[AccessFlooringSeismicRating] | None = pyd.Field(default=None, description="")
-    magnetically_attached_finish: bool | None = pyd.Field(default=None, description="")
-    permanent_finish: bool | None = pyd.Field(default=None, description="")
-    drylay: bool | None = pyd.Field(default=None, description="")
-    adjustable_height: bool | None = pyd.Field(default=None, description="")
-    fixed_height: bool | None = pyd.Field(default=None, description="")
-    finished_floor_height: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    panel_thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    concentrated_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    uniform_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    rolling_load_10_pass: AmountRangeForce | None = pyd.Field(default=None, description="")
-    rolling_load_10000_pass: AmountRangeForce | None = pyd.Field(default=None, description="")
-
 
 class CarpetRangeV1(BaseOpenEpdHierarchicalSpec):
     """

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/range/manufacturing_inputs.py

@@ -44,6 +44,7 @@ from openepd.model.specs.enums import (
     MasonryCementAstmC91Type,
     TextilesFabricType,
 )
+from openepd.model.specs.range.mixins.access_flooring_mixin import AccessFlooringRangeMixin
 
 
 class CementRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -170,6 +171,16 @@ class TextilesRangeV1(BaseOpenEpdHierarchicalSpec):
     fabric_type: list[TextilesFabricType] | None = pyd.Field(default=None, description="")
 
 
+class AccessFlooringPanelsRangeV1(BaseOpenEpdHierarchicalSpec, AccessFlooringRangeMixin):
+    """
+    Part of an access floor system.
+
+    Panels are laid on top of an access floor pedestal, creating a finish floor.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class ManufacturingInputsRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Manufacturing inputs.
@@ -180,7 +191,7 @@ class ManufacturingInputsRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     AccessFlooringPedestals: AccessFlooringPedestalsRangeV1 | None = None
     CarpetBacking: CarpetBackingRangeV1 | None = None
@@ -188,3 +199,4 @@ class ManufacturingInputsRangeV1(BaseOpenEpdHierarchicalSpec):
     CementitiousMaterials: CementitiousMaterialsRangeV1 | None = None
     ConcreteAdmixtures: ConcreteAdmixturesRangeV1 | None = None
     Textiles: TextilesRangeV1 | None = None
+    AccessFlooringPanels: AccessFlooringPanelsRangeV1 | None = None

openepd-6.18.0/src/openepd/model/specs/range/mixins/access_flooring_mixin.py

@@ -0,0 +1,42 @@
+#
+#  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 BaseOpenEpdSpec
+from openepd.model.specs.enums import (
+    AccessFlooringCoreMaterial,
+    AccessFlooringFinishMaterial,
+    AccessFlooringSeismicRating,
+    AccessFlooringStringers,
+)
+from openepd.model.validation.quantity import AmountRangeForce, AmountRangeLengthMm, AmountRangePressureMpa
+
+
+class AccessFlooringRangeMixin(BaseOpenEpdSpec):
+    core_material: list[AccessFlooringCoreMaterial] | None = pyd.Field(default=None, description="")
+    finish_material: list[AccessFlooringFinishMaterial] | None = pyd.Field(default=None, description="")
+    stringers: list[AccessFlooringStringers] | None = pyd.Field(default=None, description="")
+    seismic_rating: list[AccessFlooringSeismicRating] | None = pyd.Field(default=None, description="")
+    magnetically_attached_finish: bool | None = pyd.Field(default=None, description="")
+    permanent_finish: bool | None = pyd.Field(default=None, description="")
+    drylay: bool | None = pyd.Field(default=None, description="")
+    adjustable_height: bool | None = pyd.Field(default=None, description="")
+    fixed_height: bool | None = pyd.Field(default=None, description="")
+    finished_floor_height: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    panel_thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    concentrated_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
+    uniform_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
+    rolling_load_10_pass: AmountRangeForce | None = pyd.Field(default=None, description="")
+    rolling_load_10000_pass: AmountRangeForce | None = pyd.Field(default=None, description="")

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/singular/finishes.py

@@ -16,10 +16,6 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
-    AccessFlooringCoreMaterial,
-    AccessFlooringFinishMaterial,
-    AccessFlooringSeismicRating,
-    AccessFlooringStringers,
     AllFabrication,
     CarpetFormFactor,
     CarpetIntendedApplication,
@@ -43,14 +39,13 @@ from openepd.model.specs.enums import (
     WoodFlooringTimberSpecies,
 )
 from openepd.model.specs.singular.common import HasForestPracticesCertifiers
+from openepd.model.specs.singular.mixins.access_flooring_mixin import AccessFlooringMixin
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import (
     AreaPerVolumeStr,
-    ForceNStr,
     GwpKgCo2eStr,
     LengthMmStr,
     LengthMStr,
-    PressureMPaStr,
     RFactorStr,
     YarnWeightStr,
     validate_quantity_ge_factory,
@@ -59,7 +54,7 @@ from openepd.model.validation.quantity import (
 )
 
 
-class AccessFlooringV1(BaseOpenEpdHierarchicalSpec):
+class AccessFlooringV1(BaseOpenEpdHierarchicalSpec, AccessFlooringMixin):
     """
     Elevated floor system built on top of concrete slab surface.
 
@@ -69,30 +64,6 @@ class AccessFlooringV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    # Own fields:
-    core_material: AccessFlooringCoreMaterial | None = pyd.Field(default=None, description="", example="Cementitious")
-    finish_material: AccessFlooringFinishMaterial | None = pyd.Field(default=None, description="", example="Linoleum")
-    stringers: AccessFlooringStringers | None = pyd.Field(default=None, description="", example="Standard")
-    seismic_rating: AccessFlooringSeismicRating | None = pyd.Field(default=None, description="", example="Type 0")
-    magnetically_attached_finish: bool | None = pyd.Field(default=None, description="", example=True)
-    permanent_finish: bool | None = pyd.Field(default=None, description="", example=True)
-    drylay: bool | None = pyd.Field(default=None, description="", example=True)
-    adjustable_height: bool | None = pyd.Field(default=None, description="", example=True)
-    fixed_height: bool | None = pyd.Field(default=None, description="", example=True)
-    finished_floor_height: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
-    panel_thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
-    concentrated_load: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    uniform_load: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    rolling_load_10_pass: ForceNStr | None = pyd.Field(default=None, description="", example="1 N")
-    rolling_load_10000_pass: ForceNStr | None = pyd.Field(default=None, description="", example="1 N")
-
-    _access_flooring_rolling_load_10_pass_is_quantity_validator = pyd.validator(
-        "rolling_load_10_pass", allow_reuse=True
-    )(validate_quantity_unit_factory("N"))
-    _access_flooring_rolling_load_10000_pass_is_quantity_validator = pyd.validator(
-        "rolling_load_10000_pass", allow_reuse=True
-    )(validate_quantity_unit_factory("N"))
-
 
 class CarpetV1(BaseOpenEpdHierarchicalSpec):
     """Textile Floor Coverings."""

{openepd-6.17.0 → openepd-6.18.0}/src/openepd/model/specs/singular/manufacturing_inputs.py

@@ -27,6 +27,7 @@ from openepd.model.specs.enums import (
     MasonryCementAstmC91Type,
     TextilesFabricType,
 )
+from openepd.model.specs.singular.mixins.access_flooring_mixin import AccessFlooringMixin
 
 
 class CementV1(BaseOpenEpdHierarchicalSpec):
@@ -132,6 +133,16 @@ class TextilesV1(BaseOpenEpdHierarchicalSpec):
     fabric_type: list[TextilesFabricType] | None = pyd.Field(default=None, description="", example=["Leather"])
 
 
+class AccessFlooringPanelsV1(BaseOpenEpdHierarchicalSpec, AccessFlooringMixin):
+    """
+    Part of an access floor system.
+
+    Panels are laid on top of an access floor pedestal, creating a finish floor.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class ManufacturingInputsV1(BaseOpenEpdHierarchicalSpec):
     """
     Manufacturing inputs.
@@ -140,7 +151,7 @@ class ManufacturingInputsV1(BaseOpenEpdHierarchicalSpec):
     a construction.
     """
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     AccessFlooringPedestals: AccessFlooringPedestalsV1 | None = None
@@ -149,3 +160,4 @@ class ManufacturingInputsV1(BaseOpenEpdHierarchicalSpec):
     CementitiousMaterials: CementitiousMaterialsV1 | None = None
     ConcreteAdmixtures: ConcreteAdmixturesV1 | None = None
     Textiles: TextilesV1 | None = None
+    AccessFlooringPanels: AccessFlooringPanelsV1 | None = None

openepd-6.18.0/src/openepd/model/specs/singular/mixins/access_flooring_mixin.py

@@ -0,0 +1,49 @@
+#
+#  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 BaseOpenEpdSpec
+from openepd.model.specs.enums import (
+    AccessFlooringCoreMaterial,
+    AccessFlooringFinishMaterial,
+    AccessFlooringSeismicRating,
+    AccessFlooringStringers,
+)
+from openepd.model.validation.quantity import ForceNStr, LengthMmStr, PressureMPaStr, validate_quantity_unit_factory
+
+
+class AccessFlooringMixin(BaseOpenEpdSpec):
+    core_material: AccessFlooringCoreMaterial | None = pyd.Field(default=None, description="", example="Cementitious")
+    finish_material: AccessFlooringFinishMaterial | None = pyd.Field(default=None, description="", example="Linoleum")
+    stringers: AccessFlooringStringers | None = pyd.Field(default=None, description="", example="Standard")
+    seismic_rating: AccessFlooringSeismicRating | None = pyd.Field(default=None, description="", example="Type 0")
+    magnetically_attached_finish: bool | None = pyd.Field(default=None, description="", example=True)
+    permanent_finish: bool | None = pyd.Field(default=None, description="", example=True)
+    drylay: bool | None = pyd.Field(default=None, description="", example=True)
+    adjustable_height: bool | None = pyd.Field(default=None, description="", example=True)
+    fixed_height: bool | None = pyd.Field(default=None, description="", example=True)
+    finished_floor_height: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
+    panel_thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
+    concentrated_load: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
+    uniform_load: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
+    rolling_load_10_pass: ForceNStr | None = pyd.Field(default=None, description="", example="1 N")
+    rolling_load_10000_pass: ForceNStr | None = pyd.Field(default=None, description="", example="1 N")
+
+    _access_flooring_rolling_load_10_pass_is_quantity_validator = pyd.validator(
+        "rolling_load_10_pass", allow_reuse=True
+    )(validate_quantity_unit_factory("N"))
+    _access_flooring_rolling_load_10000_pass_is_quantity_validator = pyd.validator(
+        "rolling_load_10000_pass", allow_reuse=True
+    )(validate_quantity_unit_factory("N"))

openepd-6.18.0/src/openepd/model/validation/__init__.py

@@ -0,0 +1,15 @@
+#
+#  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.
+#