openepd 6.0.0__py3-none-any.whl → 6.0.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.0.0"
+VERSION = "6.0.1"

openepd/model/specs/base.py

@@ -14,6 +14,7 @@
 #  limitations under the License.
 #
 import dataclasses
+from types import UnionType
 from typing import Any
 
 from openepd.compat.pydantic import pyd
@@ -63,4 +64,4 @@ class CodegenSpec:
     """
 
     exclude_from_codegen: bool = False
-    override_type: type
+    override_type: type | UnionType

openepd/model/specs/range/asphalt.py

@@ -22,7 +22,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import AsphaltGradation, AsphaltMixType
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeTemperatureC
+from openepd.model.validation.quantity import AmountRangeLengthMm, TemperatureCStr
 
 
 class AsphaltRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -44,11 +44,11 @@ class AsphaltRangeV1(BaseOpenEpdHierarchicalSpec):
     ground_tire_rubber: RangeRatioFloat | None = pyd.Field(
         default=None, description="Percent of mixture that has been replaced by ground tire rubber (GTR)."
     )
-    max_temperature: AmountRangeTemperatureC | None = pyd.Field(
+    max_temperature: TemperatureCStr | None = pyd.Field(
         default=None,
         description="The upper threshold temperature to which an asphalt binder can be heated preventing the asphalt mixture from rutting",
     )
-    min_temperature: AmountRangeTemperatureC | None = pyd.Field(
+    min_temperature: TemperatureCStr | None = pyd.Field(
         default=None,
         description="The lower threshold temperature for an asphalt binder to prevent thermal cracking of the asphalt mixture.",
     )

openepd/model/specs/range/cmu.py

@@ -18,11 +18,12 @@ __all__ = ("CMURangeV1",)
 # NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
 
 
+from builtins import float
+
 from openepd.compat.pydantic import pyd
-from openepd.model.common import RangeFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CmuBlockType, CmuWeightClassification
-from openepd.model.validation.quantity import AmountRangeGWP, AmountRangePressureMpa
+from openepd.model.validation.quantity import AmountRangePressureMpa, GwpKgCo2eStr
 
 
 class CMURangeV1(BaseOpenEpdHierarchicalSpec):
@@ -40,5 +41,5 @@ class CMURangeV1(BaseOpenEpdHierarchicalSpec):
     block_type: list[CmuBlockType] | None = pyd.Field(default=None, description="")
     insulated: bool | None = pyd.Field(default=None, description="")
     sound_performance: bool | None = pyd.Field(default=None, description="")
-    b1_recarbonation: AmountRangeGWP | None = pyd.Field(default=None, description="")
-    b1_recarbonation_z: RangeFloat | None = pyd.Field(default=None, description="")
+    b1_recarbonation: GwpKgCo2eStr | None = pyd.Field(default=None, description="")
+    b1_recarbonation_z: float | None = pyd.Field(default=None, description="")

openepd/model/specs/range/electrical.py

@@ -58,6 +58,7 @@ from openepd.model.validation.quantity import (
     AmountRangeLuminosity,
     AmountRangeMass,
     AmountRangePower,
+    AmountRangeUtilization,
 )
 
 
@@ -376,7 +377,7 @@ class LightingRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     color_temperature: AmountRangeColorTemperature | None = pyd.Field(default=None, description="")
-    typical_utilization: str | None = pyd.Field(default=None, description="")
+    typical_utilization: AmountRangeUtilization | None = pyd.Field(default=None, description="")
     luminosity: AmountRangeLuminosity | None = pyd.Field(default=None, description="")
     wattage: AmountRangePower | None = pyd.Field(default=None, description="")
     color_rendering_index: RangeFloat | None = pyd.Field(default=None, description="")

openepd/model/specs/range/finishes.py

@@ -78,7 +78,14 @@ from openepd.model.specs.enums import (
     WoodFlooringFabrication,
     WoodFlooringTimberSpecies,
 )
-from openepd.model.validation.quantity import AmountRangeGWP, AmountRangeLengthMm, AmountRangePressureMpa
+from openepd.model.validation.quantity import (
+    AmountRangeForce,
+    AmountRangeGWP,
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeRFactor,
+    AmountRangeYarnWeight,
+)
 
 
 class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -106,8 +113,8 @@ class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
     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: str | None = pyd.Field(default=None, description="")
-    rolling_load_10000_pass: str | 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):
@@ -124,7 +131,7 @@ class CarpetRangeV1(BaseOpenEpdHierarchicalSpec):
     intended_application: list[CarpetIntendedApplication] | None = pyd.Field(default=None, description="")
     manufacture_type: list[CarpetManufactureType] | None = pyd.Field(default=None, description="")
     form_factor: list[CarpetFormFactor] | None = pyd.Field(default=None, description="")
-    yarn_weight: str | None = pyd.Field(default=None, description="")
+    yarn_weight: AmountRangeYarnWeight | None = pyd.Field(default=None, description="")
     yarn_type: list[CarpetYarnType] | None = pyd.Field(default=None, description="")
     fire_radiant_panel_rating_astme648: str | None = pyd.Field(default=None, description="")
     fire_smoke_density_rating_astme648: str | None = pyd.Field(default=None, description="")
@@ -457,7 +464,7 @@ class GypsumRangeV1(BaseOpenEpdHierarchicalSpec):
     fire_rating: list[GypsumFireRating] | None = pyd.Field(default=None, description="")
     thickness: list[GypsumThickness] | None = pyd.Field(default=None, description="")
     facing: list[GypsumFacing] | None = pyd.Field(default=None, description="")
-    r_factor: str | None = pyd.Field(default=None, description="")
+    r_factor: AmountRangeRFactor | None = pyd.Field(default=None, description="")
     flame_spread_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     smoke_production_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     surface_abrasion_d4977: RangeInt | None = pyd.Field(default=None, description="")

openepd/model/specs/range/masonry.py

@@ -25,7 +25,7 @@ __all__ = (
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.validation.quantity import AmountRangePressureMpa
+from openepd.model.validation.quantity import AmountRangePressureMpa, AmountRangeThermalConductivity
 
 
 class GMURangeV1(BaseOpenEpdHierarchicalSpec):
@@ -48,7 +48,7 @@ class AutoclavedAeratedConcreteRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     strength_28d: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    thermal_conductivity: str | None = pyd.Field(default=None, description="")
+    thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(default=None, description="")
     white: bool | None = pyd.Field(default=None, description="")
 
 

openepd/model/specs/range/openings.py

@@ -59,7 +59,12 @@ from openepd.model.specs.enums import (
     ThermalSeparation,
 )
 from openepd.model.specs.singular.openings import GlazingIntendedApplication, NAFSPerformanceClass
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa, AmountRangeSpeed
+from openepd.model.validation.quantity import (
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeSpeed,
+    AmountRangeUFactor,
+)
 
 
 class PanelDoorsRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -328,7 +333,7 @@ class NAFSFenestrationRangeV1(BaseOpenEpdHierarchicalSpec):
     hurricane_resistant: bool | None = pyd.Field(
         default=None, description="The product has been designed to resist windborne debris."
     )
-    assembly_u_factor: str | None = pyd.Field(
+    assembly_u_factor: AmountRangeUFactor | None = pyd.Field(
         default=None, description="Weighted average conductance of heat across assembly (including frame)."
     )
     air_infiltration: AmountRangeSpeed | None = pyd.Field(
@@ -386,7 +391,9 @@ class InsulatingGlazingUnitsRangeV1(BaseOpenEpdHierarchicalSpec):
         default=None,
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
     )
-    cog_u_factor: str | None = pyd.Field(default=None, description="Conductance of heat at center of glass.")
+    cog_u_factor: AmountRangeUFactor | None = pyd.Field(
+        default=None, description="Conductance of heat at center of glass."
+    )
     spacer: list[Spacer] | None = pyd.Field(default=None, description="Spacer material for Integrated Glass Unit.")
 
 

openepd/model/specs/range/sheathing.py

@@ -26,7 +26,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeInt
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
-from openepd.model.validation.quantity import AmountRangeLengthMm
+from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeRFactor
 
 
 class CementitiousSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -58,7 +58,7 @@ class GypsumSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
     fire_rating: list[GypsumFireRating] | None = pyd.Field(default=None, description="")
     thickness: list[GypsumThickness] | None = pyd.Field(default=None, description="")
     facing: list[GypsumFacing] | None = pyd.Field(default=None, description="")
-    r_factor: str | None = pyd.Field(default=None, description="")
+    r_factor: AmountRangeRFactor | None = pyd.Field(default=None, description="")
     flame_spread_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     smoke_production_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     surface_abrasion_d4977: RangeInt | None = pyd.Field(default=None, description="")

openepd/model/specs/range/steel.py

@@ -44,7 +44,12 @@ from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import SteelComposition, SteelRebarGrade
 from openepd.model.specs.singular.steel import SteelMakingRoute
 from openepd.model.standard import Standard
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa
+from openepd.model.validation.quantity import (
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeThermalConductivity,
+    AmountRangeThermalExpansion,
+)
 
 
 class ColdFormedFramingRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -224,10 +229,10 @@ class StructuralSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     modulus_of_elasticity: AmountRangePressureMpa | None = pyd.Field(
         default=None, description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus "
     )
-    thermal_expansion: str | None = pyd.Field(
+    thermal_expansion: AmountRangeThermalExpansion | None = pyd.Field(
         default=None, description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion"
     )
-    thermal_conductivity: str | None = pyd.Field(
+    thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(
         default=None,
         description="Thermal Conductivity, https://en.wikipedia.org/wiki/Thermal_conductivity_and_resistivity",
     )

openepd/model/specs/range/wood.py

@@ -32,8 +32,9 @@ __all__ = (
 # NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
 
 
+from builtins import float
+
 from openepd.compat.pydantic import pyd
-from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
@@ -45,6 +46,7 @@ from openepd.model.specs.enums import (
     SawnTimberSpecies,
     SheathingPanelsFabrication,
 )
+from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 
@@ -212,12 +214,12 @@ class WoodRangeV1(BaseOpenEpdHierarchicalSpec):
     weather_exposed: bool | None = pyd.Field(default=None, description="Weather exposed")
     fire_retardant: bool | None = pyd.Field(default=None, description="Fire retardant")
     decay_resistant: bool | None = pyd.Field(default=None, description="Decay resistant")
-    fsc_certified: RangeRatioFloat | None = pyd.Field(
+    fsc_certified: RatioFloat | None = pyd.Field(
         default=None, description="Forest Stewardship Council certified proportion"
     )
-    fsc_certified_z: RangeFloat | None = pyd.Field(default=None, description="")
-    recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="Recycled content")
-    recycled_content_z: RangeFloat | None = pyd.Field(default=None, description="")
+    fsc_certified_z: float | None = pyd.Field(default=None, description="")
+    recycled_content: RatioFloat | None = pyd.Field(default=None, description="Recycled content")
+    recycled_content_z: float | None = pyd.Field(default=None, description="")
     CompositeLumber: CompositeLumberRangeV1 | None = None
     DimensionLumber: DimensionLumberRangeV1 | None = None
     HeavyTimber: HeavyTimberRangeV1 | None = None

openepd/model/specs/singular/__init__.py

@@ -14,6 +14,7 @@
 #  limitations under the License.
 #
 from openepd.model.base import BaseOpenEpdSchema
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.singular.accessories import AccessoriesV1
 from openepd.model.specs.singular.aggregates import AggregatesV1
 from openepd.model.specs.singular.aluminium import AluminiumV1
@@ -51,10 +52,14 @@ from openepd.model.specs.singular.utility_piping import UtilityPipingV1
 from openepd.model.specs.singular.wood import WoodV1
 from openepd.model.specs.singular.wood_joists import WoodJoistsV1
 
+__all__ = ("Specs",)
 
-class Specs(BaseOpenEpdSchema):
+
+class Specs(BaseOpenEpdHierarchicalSpec):
     """Material specific specs."""
 
+    _EXT_VERSION = "1.0"
+
     # Nested specs:
     CMU: CMUV1 | None = None
     Masonry: MasonryV1 | None = None

openepd/model/specs/singular/asphalt.py

@@ -13,8 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from typing import Annotated
+
 from openepd.compat.pydantic import pyd
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.enums import AsphaltGradation, AsphaltMixType
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr, TemperatureCStr
@@ -48,14 +50,14 @@ class AsphaltV1(BaseOpenEpdHierarchicalSpec):
         ge=0,
         le=1,
     )
-    max_temperature: TemperatureCStr | None = pyd.Field(
+    max_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pyd.Field(
         default=None,
         description="The upper threshold temperature to which an asphalt "
         "binder can be heated preventing the asphalt mixture "
         "from rutting",
         example="90 °C",
     )
-    min_temperature: TemperatureCStr | None = pyd.Field(
+    min_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pyd.Field(
         default=None,
         description="The lower threshold temperature for an asphalt "
         "binder to prevent thermal cracking of the asphalt"

openepd/model/specs/singular/cmu.py

@@ -13,8 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from typing import Annotated
+
 from openepd.compat.pydantic import pyd
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.enums import CmuBlockType, CmuWeightClassification
 from openepd.model.validation.quantity import GwpKgCo2eStr, PressureMPaStr
 
@@ -31,5 +33,9 @@ class CMUV1(BaseOpenEpdHierarchicalSpec):
     block_type: CmuBlockType | None = pyd.Field(default=None, description="", example="Gray")
     insulated: bool | None = pyd.Field(default=None, description="", example=True)
     sound_performance: bool | None = pyd.Field(default=None, description="", example=True)
-    b1_recarbonation: GwpKgCo2eStr | None = pyd.Field(default=None, description="", example="1 kgCO2e")
-    b1_recarbonation_z: float | None = pyd.Field(default=None, description="", example=2.3)
+    b1_recarbonation: Annotated[GwpKgCo2eStr | None, CodegenSpec(override_type=GwpKgCo2eStr)] = pyd.Field(
+        default=None, description="", example="1 kgCO2e"
+    )
+    b1_recarbonation_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
+        default=None, description="", example=2.3
+    )

openepd/model/specs/singular/electrical.py

@@ -24,6 +24,7 @@ from openepd.model.validation.quantity import (
     LuminosityStr,
     MassKgStr,
     PowerStr,
+    UtilizationStr,
     validate_quantity_ge_factory,
     validate_quantity_le_factory,
     validate_quantity_unit_factory,
@@ -255,7 +256,7 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     color_temperature: ColorTemperatureStr | None = pyd.Field(default=None, description="", example="1 K")
-    typical_utilization: str | None = pyd.Field(default=None, description="", example="1 h / yr")
+    typical_utilization: UtilizationStr | None = pyd.Field(default=None, description="", example="1 h / yr")
     luminosity: LuminosityStr | None = pyd.Field(default=None, description="", example="1 lumen")
     wattage: PowerStr | None = pyd.Field(default=None, description="")
     color_rendering_index: float | None = pyd.Field(default=None, description="", example=2.3)

openepd/model/specs/singular/finishes.py

@@ -46,10 +46,13 @@ from openepd.model.specs.singular.common import HasForestPracticesCertifiers
 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,
     validate_quantity_le_factory,
     validate_quantity_unit_factory,
@@ -80,8 +83,8 @@ class AccessFlooringV1(BaseOpenEpdHierarchicalSpec):
     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: str | None = pyd.Field(default=None, description="", example="1 N")
-    rolling_load_10000_pass: str | None = pyd.Field(default=None, description="", example="1 N")
+    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
@@ -104,7 +107,7 @@ class CarpetV1(BaseOpenEpdHierarchicalSpec):
     )
     manufacture_type: CarpetManufactureType | None = pyd.Field(default=None, description="", example="Tufted")
     form_factor: CarpetFormFactor | None = pyd.Field(default=None, description="", example="Tiles")
-    yarn_weight: str | None = pyd.Field(default=None, description="", example="1 g / m2")
+    yarn_weight: YarnWeightStr | None = pyd.Field(default=None, description="", example="1 g / m2")
     yarn_type: CarpetYarnType | None = pyd.Field(default=None, description="", example="Nylon 6,6")
     fire_radiant_panel_rating_astme648: str | None = pyd.Field(default=None, description="")
     fire_smoke_density_rating_astme648: str | None = pyd.Field(default=None, description="")
@@ -446,7 +449,7 @@ class GypsumV1(BaseOpenEpdHierarchicalSpec):
     fire_rating: GypsumFireRating | None = pyd.Field(default=None, description="", example="-")
     thickness: GypsumThickness | None = pyd.Field(default=None, description="", example="1 m")
     facing: GypsumFacing | None = pyd.Field(default=None, description="", example="Paper")
-    r_factor: str | None = pyd.Field(default=None, description="", example="1 RSI")
+    r_factor: RFactorStr | None = pyd.Field(default=None, description="", example="1 RSI")
     flame_spread_astm_e84: int | None = pyd.Field(default=None, description="", example=3)
     smoke_production_astm_e84: int | None = pyd.Field(default=None, description="", example=3)
     surface_abrasion_d4977: int | None = pyd.Field(default=None, description="", example=3)

openepd/model/specs/singular/masonry.py

@@ -17,6 +17,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.quantity import (
     PressureMPaStr,
+    ThermalConductivityStr,
     validate_quantity_ge_factory,
     validate_quantity_unit_factory,
 )
@@ -35,7 +36,9 @@ class AutoclavedAeratedConcreteV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     strength_28d: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    thermal_conductivity: str | None = pyd.Field(default=None, description="", example="1 W / (m * K)")
+    thermal_conductivity: ThermalConductivityStr | None = pyd.Field(
+        default=None, description="", example="1 W / (m * K)"
+    )
     white: bool | None = pyd.Field(default=None, description="", example=True)
 
     _aac_thermal_conductivity_is_quantity_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(

openepd/model/specs/singular/openings.py

@@ -26,7 +26,13 @@ from openepd.model.specs.enums import (
     ThermalSeparation,
 )
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, SpeedStr, validate_quantity_unit_factory
+from openepd.model.validation.quantity import (
+    LengthMmStr,
+    PressureMPaStr,
+    SpeedStr,
+    UFactorStr,
+    validate_quantity_unit_factory,
+)
 
 
 class GlazingIntendedApplication(BaseOpenEpdSchema):
@@ -346,7 +352,7 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
         default=None, description="The product has been designed to resist windborne debris.", example=True
     )
 
-    assembly_u_factor: str | None = pyd.Field(
+    assembly_u_factor: UFactorStr | None = pyd.Field(
         default=None,
         description="Weighted average conductance of heat across assembly (including frame).",
         example="1 USI",
@@ -417,7 +423,7 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
         example=3,
     )
-    cog_u_factor: str | None = pyd.Field(
+    cog_u_factor: UFactorStr | None = pyd.Field(
         default=None, description="Conductance of heat at center of glass.", example="1 USI"
     )
     spacer: Spacer | None = pyd.Field(

openepd/model/specs/singular/sheathing.py

@@ -16,7 +16,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
-from openepd.model.validation.quantity import LengthMmStr, validate_quantity_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, RFactorStr, validate_quantity_unit_factory
 
 
 class CementitiousSheathingBoardV1(BaseOpenEpdHierarchicalSpec):
@@ -51,7 +51,7 @@ class GypsumSheathingBoardV1(BaseOpenEpdHierarchicalSpec):
     thickness: GypsumThickness | None = pyd.Field(default=None, description="", example="9 mm")
     facing: GypsumFacing | None = pyd.Field(default=None, description="", example="Paper")
 
-    r_factor: str | None = pyd.Field(default=None, description="", example="1 RSI")
+    r_factor: RFactorStr | None = pyd.Field(default=None, description="", example="1 RSI")
 
     flame_spread_astm_e84: int | None = pyd.Field(default=None, description="", example=3)
     smoke_production_astm_e84: int | None = pyd.Field(default=None, description="", example=3)

openepd/model/specs/singular/steel.py

@@ -21,7 +21,13 @@ from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpe
 from openepd.model.specs.enums import SteelComposition, SteelRebarGrade
 from openepd.model.standard import Standard
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_quantity_unit_factory
+from openepd.model.validation.quantity import (
+    LengthMmStr,
+    PressureMPaStr,
+    ThermalConductivityStr,
+    ThermalExpansionStr,
+    validate_quantity_unit_factory,
+)
 
 
 class SteelMakingRoute(BaseOpenEpdSchema):
@@ -175,15 +181,15 @@ class StructuralSteelV1(BaseOpenEpdHierarchicalSpec):
         description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus ",
         example="193 GPa",
     )
-    thermal_expansion: str | None = pyd.Field(
+    thermal_expansion: ThermalExpansionStr | None = pyd.Field(
         default=None,
         description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion",
         example="1.11E-5 / K",
     )
-    thermal_conductivity: str | None = pyd.Field(
+    thermal_conductivity: ThermalConductivityStr | None = pyd.Field(
         default=None,
         description="Thermal Conductivity, https://en.wikipedia.org/wiki/Thermal_conductivity_and_resistivity",
-        example="1.45E-5 W / (m * K)",
+        example="1.45E-5 W / m / K)",
     )
 
     _steel_thermal_expansion_is_quantity_validator = pyd.validator("thermal_expansion", allow_reuse=True)(

openepd/model/specs/singular/wood.py

@@ -13,8 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from typing import Annotated
+
 from openepd.compat.pydantic import pyd
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.enums import (
     AllFabrication,
     AllTimberSpecies,
@@ -156,15 +158,19 @@ class WoodV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     weather_exposed: bool | None = pyd.Field(default=None, description="Weather exposed", example=True)
     fire_retardant: bool | None = pyd.Field(default=None, description="Fire retardant", example=True)
     decay_resistant: bool | None = pyd.Field(default=None, description="Decay resistant", example=True)
-    fsc_certified: RatioFloat | None = pyd.Field(
+    fsc_certified: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
         default=None, description="Forest Stewardship Council certified proportion", example=0.3, ge=0, le=1
     )
-    fsc_certified_z: float | None = pyd.Field(default=None, description="", example=0.7)
+    fsc_certified_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
+        default=None, description="", example=0.7
+    )
 
-    recycled_content: RatioFloat | None = pyd.Field(
+    recycled_content: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
         default=None, description="Recycled content", example=0.3, ge=0, le=1
     )
-    recycled_content_z: float | None = pyd.Field(default=None, description="", example=0.7)
+    recycled_content_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
+        default=None, description="", example=0.7
+    )
 
     # Nested specs:
     CompositeLumber: CompositeLumberV1 | None = None

openepd/model/validation/quantity.py

@@ -307,6 +307,48 @@ class AreaPerVolumeStr(QuantityStr):
     unit = "m2 / l"
 
 
+class ThermalConductivityStr(QuantityStr):
+    """Thermal conductivity quantity type."""
+
+    unit = "1 W / K / m"
+
+
+class ThermalExpansionStr(QuantityStr):
+    """Thermal conductivity quantity type."""
+
+    unit = "1 / K"
+
+
+class ForceNStr(QuantityStr):
+    """Force (N) type."""
+
+    unit = "1 N"
+
+
+class YarnWeightStr(QuantityStr):
+    """Yarn weight quantity type."""
+
+    unit = "1 g / m2"
+
+
+class UtilizationStr(QuantityStr):
+    """Utilization quantity type."""
+
+    unit = "1 h / yr"
+
+
+class UFactorStr(QuantityStr):
+    """Utilization quantity type."""
+
+    unit = "1 USI"
+
+
+class RFactorStr(QuantityStr):
+    """R-Factor type."""
+
+    unit = "1 RSI"
+
+
 class WithDimensionalityMixin(BaseOpenEpdSchema):
     """Class for dimensionality-validated amounts."""
 
@@ -696,6 +738,136 @@ class AmountRangeAreaPerVolume(AmountRangeWithDimensionality, WithFlowRateMixin)
     pass
 
 
+class WithThermalConductivity(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = ThermalConductivityStr.unit
+
+
+class AmountThermalConductivityMixin(Amount, WithThermalConductivity):
+    """Area per volume."""
+
+    pass
+
+
+class AmountRangeThermalConductivity(AmountRangeWithDimensionality, WithThermalConductivity):
+    """Area per volume range."""
+
+    pass
+
+
+class WithForce(WithDimensionalityMixin):
+    """
+    Unit validation mixin.
+
+    May the Force be with you.
+    """
+
+    dimensionality_unit = ForceNStr.unit
+
+
+class AmountForce(Amount, WithForce):
+    """Area per volume."""
+
+    pass
+
+
+class AmountRangeForce(AmountRangeWithDimensionality, WithForce):
+    """Area per volume range."""
+
+    pass
+
+
+class WithYarnWeight(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = YarnWeightStr.unit
+
+
+class AmountYarnWeight(Amount, WithYarnWeight):
+    """Yarn weight."""
+
+    pass
+
+
+class AmountRangeYarnWeight(AmountRangeWithDimensionality, WithYarnWeight):
+    """Yarn weight range."""
+
+    pass
+
+
+class WithThermalExpansion(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = ThermalExpansionStr.unit
+
+
+class AmountThermalExpansion(Amount, WithThermalExpansion):
+    """Yarn weight."""
+
+    pass
+
+
+class AmountRangeThermalExpansion(AmountRangeWithDimensionality, WithThermalExpansion):
+    """Yarn weight range."""
+
+    pass
+
+
+class WithUtilization(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = UtilizationStr.unit
+
+
+class AmountUtilization(Amount, WithUtilization):
+    """Utilization."""
+
+    pass
+
+
+class AmountRangeUtilization(AmountRangeWithDimensionality, WithUtilization):
+    """Utilization range."""
+
+    pass
+
+
+class WithUFactor(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = UFactorStr.unit
+
+
+class AmountUFactor(Amount, WithUFactor):
+    """U-Factor."""
+
+    pass
+
+
+class AmountRangeUFactor(AmountRangeWithDimensionality, WithUFactor):
+    """U-Factor range."""
+
+    pass
+
+
+class WithRFactor(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = RFactorStr.unit
+
+
+class AmountRFactor(Amount, WithRFactor):
+    """R-Factor."""
+
+    pass
+
+
+class AmountRangeRFactor(AmountRangeWithDimensionality, WithRFactor):
+    """R-Factor range."""
+
+    pass
+
+
 # known range amounts
 SUPPORTED_RANGE_TYPES: tuple[type[AmountRangeWithDimensionality], ...] = (
     AmountRangeMass,
@@ -718,6 +890,13 @@ SUPPORTED_RANGE_TYPES: tuple[type[AmountRangeWithDimensionality], ...] = (
     AmountRangeFlowRate,
     AmountRangeMassPerLength,
     AmountRangeAreaPerVolume,
+    AmountRangeThermalConductivity,
+    AmountRangeForce,
+    AmountRangeYarnWeight,
+    AmountRangeThermalExpansion,
+    AmountRangeUtilization,
+    AmountRangeUFactor,
+    AmountRangeRFactor,
 )
 
 # known range amount mapping by unit

{openepd-6.0.0.dist-info → openepd-6.0.1.dist-info}/METADATA

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

{openepd-6.0.0.dist-info → openepd-6.0.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=7Oh8Rchc2xBDqLEabanDtlyvfKW7gtjKvpBhLaqpDp4,638
+openepd/__version__.py,sha256=Oa5j0gzOB1wIVumdMbOVzGNMS9BPyyfZpuNULXNLrw4,638
 openepd/api/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=mxWwDokEGMe87Px8C_aHvIdVKZVHrEAuVtaSA1zJchU,7953
@@ -48,92 +48,92 @@ openepd/model/pcr.py,sha256=QknLtTn6Y14JORWKQ1qBqGgKnZpbKgqNiYF3Axl4U4c,5494
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
 openepd/model/specs/__init__.py,sha256=IAevXqqYrCWlTH4z4Fy9o77vaOLinX56G05iIJJfm0M,3094
 openepd/model/specs/asphalt.py,sha256=V-N7NbrxyNnjgNXQbJPj17ZFM3Q-qxTxxjqpx61wEfA,3350
-openepd/model/specs/base.py,sha256=xYIzCmDDUWEJRVbAFt10HY_c_5d81deFFyraxzpidEg,2612
+openepd/model/specs/base.py,sha256=JgXvfy8K1Jpcai1eCUDZ-ndsLYkL-dcDyH2hQls6Znw,2652
 openepd/model/specs/concrete.py,sha256=spMvijIv79c87PXT_YV7coG851AkJ1ILl9EHCxN2-6E,9593
 openepd/model/specs/enums.py,sha256=rh35d0CZUIp1GDYopldu-dUJ3YQtXlKzJuMpyFLKT2w,63602
 openepd/model/specs/range/__init__.py,sha256=LmBClxzTNpWzGwS1zvFoAxbKILrMRMz22mJXKYu2u8I,4502
 openepd/model/specs/range/accessories.py,sha256=T3z-5jLoIVIIGeQi2cc5fMP3a7uGgvoW2E_SVmr3c30,2498
 openepd/model/specs/range/aggregates.py,sha256=nxk6iZHzs0CIoUMWSw4IfB-D4tGd4prh9O2HXnC9u70,2549
 openepd/model/specs/range/aluminium.py,sha256=FcIfVKwwCH-58K7YQ1lRQx0DNcojcj43oplJGYZfh2s,2745
-openepd/model/specs/range/asphalt.py,sha256=0Vj_94E2-s43CMxzFW7-s4LmZW_dRPWVxVKRJfdaz0Y,2958
+openepd/model/specs/range/asphalt.py,sha256=tmUUBlhg-lqqfgEHz_5LvdwurCkkemRFAGm_PIODAwU,2934
 openepd/model/specs/range/bulk_materials.py,sha256=Vqm6eY6Kfi7vSx4n9JUrGh15JVNZ1YapdBXQR9usICU,1051
 openepd/model/specs/range/cast_decks_and_underlayment.py,sha256=CzQhqq4hhtLAbm7SbrcOH0CMYFNzxcMYDy-L9jk3txY,1132
 openepd/model/specs/range/cladding.py,sha256=ITPk6sThzryLt8pVtvqy5QWeuDOg2-LVinkG-p9imTY,7236
-openepd/model/specs/range/cmu.py,sha256=uUlkJGfbRo3IM919x0Ha0cNXscsYbSitVsgAEDVIHy8,1887
+openepd/model/specs/range/cmu.py,sha256=d0Kx5AsUazziYDfgEOyp0ddLKDprxw5W2v7xcnKDvGw,1862
 openepd/model/specs/range/concrete.py,sha256=3nVuWag3QP56YGxcRUAYlVEbagxLaKP0RE0TaBqxums,6907
 openepd/model/specs/range/conveying_equipment.py,sha256=Ztvd4m3ECPFHtpb_k16nqPZmibH44YXbhafI2kb2CwQ,3176
-openepd/model/specs/range/electrical.py,sha256=SIlOoGiH2vUCOlQfKuMzjQsKjocTKYeoZ-rw1g8IY7U,11813
+openepd/model/specs/range/electrical.py,sha256=VDaUrqnGi8b88ChL19FReZCiNXSmd98hqgwmEdE6S4Y,11860
 openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,sha256=6xOBAN3rjJ1SeGAiD-bTEWJB2rJ7VmUDPV3JHWHUTp4,2525
 openepd/model/specs/range/electricity.py,sha256=isRgk35_gYhZWR3d36dpxHKDIrmpuOqpaUCWigNE4Co,997
-openepd/model/specs/range/finishes.py,sha256=6yFMYETA8GoaBBB8vPKP_hAO9rc33RuV938wv1igy0Q,21142
+openepd/model/specs/range/finishes.py,sha256=hEGxRje4_yXoDaHIK02jAAkGta4Fyds5JFvlOrzD0_0,21291
 openepd/model/specs/range/fire_and_smoke_protection.py,sha256=j7E5rqPtNrJCksq8QL-m2gX9sqrOADuTNJkc0rUH7mo,3337
 openepd/model/specs/range/furnishings.py,sha256=eQ4T91RXNEhTe3hb8VG9NPGWNfjQy1yKSHrGkRGNO5k,3234
 openepd/model/specs/range/grouting.py,sha256=5w3kU3MnUreVilpri-eFRe9TTZvrJsZ9_MLiK3GTlg0,1095
 openepd/model/specs/range/manufacturing_inputs.py,sha256=LXpjXSvq9baeVkqOUbU1yFjMP18KJZNa04UxHr27gto,5574
-openepd/model/specs/range/masonry.py,sha256=n-zVQ_fyrwQg-xqgKXmt5b5CCMDMBgOi4NKq9Kf4gVs,2808
+openepd/model/specs/range/masonry.py,sha256=6325-KdNFnZTRs9v2D1sq-3isgfiEOuNd-Ou4lSW9hw,2867
 openepd/model/specs/range/material_handling.py,sha256=Ri7v4WAguusQQZWU_GZo6DZmYkjgFDB44sScj2jiSOo,1483
 openepd/model/specs/range/mechanical.py,sha256=Btttb_UkWok5lfNOkQTq2doaPJJUAcZr5p4Xz-buXw4,10267
 openepd/model/specs/range/mechanical_insulation.py,sha256=BUC_BfjRm0GagW5gpKXtOTpCvf_78um9Hry8BvFZ0_Q,1737
 openepd/model/specs/range/network_infrastructure.py,sha256=_uSvY2ppIZ1u5YS7XhoReep8c0kY67WmylFF439xUUU,8498
-openepd/model/specs/range/openings.py,sha256=EtcAChNwIki0QXzDNuquuyqixBe-bETOqJcnGIKQIUs,15366
+openepd/model/specs/range/openings.py,sha256=WbujF3EW3zjcUgaDlHCufvMxR3nbOvTYaazEiNiL1TQ,15451
 openepd/model/specs/range/other_electrical_equipment.py,sha256=8pHsH9mkwb-eeLPejgsgUOAHmj9vcd_TfqjbjD5-100,1001
 openepd/model/specs/range/other_materials.py,sha256=Uy29e4PDkzDI_aX6VoJTLnUTM6zy362NiSxKHFhxEeI,4495
 openepd/model/specs/range/plumbing.py,sha256=bGbd_hRSDCXnZREEUz4U6N3l5GcAh4EmtoF8yp5z5Xc,5342
 openepd/model/specs/range/precast_concrete.py,sha256=iwz3vmrArJDVxKF77dvlTAC092EHZu4ZBQbyPZeakl0,3763
-openepd/model/specs/range/sheathing.py,sha256=I8SmASto7jGukpYOt2pUYRroniP_seAP17I36LCiQaw,3360
-openepd/model/specs/range/steel.py,sha256=BKaFzRQnLPH2YL_ZTGSzP7B9rfk53cCJgE2kk0HnUf8,10040
+openepd/model/specs/range/sheathing.py,sha256=F7g1JOrGoVdrtyyh_0IryBTpf7l2hzGKclcanTWk624,3395
+openepd/model/specs/range/steel.py,sha256=Jujwb0ZCCn9LmWx6WmYMu3S1Rx_-gt3KmoA9tddaYfU,10173
 openepd/model/specs/range/thermal_moisture_protection.py,sha256=tNimOVhUBn3U4821d5oqY3D3E0-6gB4Bp3F4gzoCScY,9409
 openepd/model/specs/range/utility_piping.py,sha256=qCyJbOMZQP1nvA71qFos5wWx7xGhb8DFpeGaka8OkjQ,2665
-openepd/model/specs/range/wood.py,sha256=-MAwCt16clFfzMp-sUh3UWyqijaqH9Vr6hMpjaRmxuA,6943
+openepd/model/specs/range/wood.py,sha256=zRsOsSOkxT84pQVvf9S4m34kFHa7HOppQK1Ggt_toUk,6946
 openepd/model/specs/range/wood_joists.py,sha256=FevwQ3ebxMStesFehjyBCw4vxTQOYOZnPCdmobo3TGY,1785
-openepd/model/specs/singular/__init__.py,sha256=PqfDn8URWef_DPCk27oIMR_KM04LHTwwxHEj-fDSXTw,4924
+openepd/model/specs/singular/__init__.py,sha256=T99PWY-76bYBg-Fi10R0PhjzpiG9BWv62lmjddZI7-Y,5047
 openepd/model/specs/singular/accessories.py,sha256=hEnrW4Vdr9GopR_A9gF8QyUyKJ9i5sx4khrNYDVLwy8,2013
 openepd/model/specs/singular/aggregates.py,sha256=EoAdyZc6QPHqGRn8c6VzoXx1wU05FH9UwQ7aOgU_Zkc,2934
 openepd/model/specs/singular/aluminium.py,sha256=LFkBtSRWajBFRni3V8IPZtRjIo-h8zlvPLaVSVYpzJs,2403
-openepd/model/specs/singular/asphalt.py,sha256=vfYz6ekRPDZdQeLo1rgrHdHRhOqaPPK1VxzLjjFs79w,3142
+openepd/model/specs/singular/asphalt.py,sha256=mnScaoGPZ7xCuKAPpJNkOGkuJxqo0iVIREPhXzECaj4,3295
 openepd/model/specs/singular/bulk_materials.py,sha256=otVwnI8N5zCs-JqklykdQDenaKqlgfBn4bQKp8JKGwU,875
 openepd/model/specs/singular/cast_decks_and_underlayment.py,sha256=qZjryfTZc1ltPUkut7pkITb-wwZmBZWGIfUl1p8FNXs,955
 openepd/model/specs/singular/cladding.py,sha256=PtH41V8K23-fIlqxgsAqXH5rLVgR7-IOHwdfJ-KuCW0,6588
-openepd/model/specs/singular/cmu.py,sha256=9Bu2JH5qd-WY8M3mIsp_dnTNfPRvQjeE00pDNIPqbTw,1784
+openepd/model/specs/singular/cmu.py,sha256=NaeAcAiN1NkV_kxH1lyexb1Xas2ShSdWWP-7kE227SA,1952
 openepd/model/specs/singular/common.py,sha256=iNeJmVYZURVQWewx3zskwnwy7DBuaggCHFWQBThtY2A,1048
 openepd/model/specs/singular/concrete.py,sha256=PexUR9w_NAkZ_VfgevxeaDqtipbaTY2mVRpPzp8uZnI,7718
 openepd/model/specs/singular/conveying_equipment.py,sha256=4ftx12OG-9mUvOkoFvx9JKrHQERHrZBDqoCnvmFFQLA,3042
-openepd/model/specs/singular/electrical.py,sha256=Df4BJ4ToqJ3mhV1Hj4MRJ_Jm_tStHw8OkXHluxiIRFw,11082
+openepd/model/specs/singular/electrical.py,sha256=IJgSbbcOvUIu70EqtG9qZvUKjtRvFda5eX9-VqRhyH8,11113
 openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.py,sha256=h6UQixACOHrquhQ2GFqqYWel_zqOXT-vAkI0o_RLf0A,1978
 openepd/model/specs/singular/electricity.py,sha256=iGtN21K1MRVwoRfO6friVgiXc2b6cVdITbvnXqLmW3k,823
-openepd/model/specs/singular/finishes.py,sha256=CpJfBaDjnJJSnB_R8VK8RuJv1pBB3TG4SdjJMaiVBxU,22492
+openepd/model/specs/singular/finishes.py,sha256=PUzskF15PnxzWJn9RKRdPcmeoefYH81OtzWtzsxUb70,22571
 openepd/model/specs/singular/fire_and_smoke_protection.py,sha256=ALV3ixBdd8Bi-rr6Cav7pQhT1XKVqC0UI8lYBJKn9q8,3058
 openepd/model/specs/singular/furnishings.py,sha256=z3SmlY98A9AUiQTPpe16QsSlDK3H0jXTRGx-nii8BqM,2571
 openepd/model/specs/singular/grouting.py,sha256=mDpfsax6TO72SuBqv8HftJDYoQPP741dD1vi_2cuNCE,934
 openepd/model/specs/singular/manufacturing_inputs.py,sha256=-y7WDU4hdKc-boGCpYPT2SyGV83cnNHz76imnzIykaQ,5093
-openepd/model/specs/singular/masonry.py,sha256=XrmzDqO0ySSkK30IBbIu5BeN6EJ29BxRNLBwAODXBek,3104
+openepd/model/specs/singular/masonry.py,sha256=VC_UspsiNN9qAhW-I3XgRGYkf0UDL7tY23MO6gypKmM,3165
 openepd/model/specs/singular/material_handling.py,sha256=hx8fisNcFw6GXC7uMfW-4wkGUS8xJA9gTk_WpZGHkqY,1274
 openepd/model/specs/singular/mechanical.py,sha256=fjvqP_bmyVM0bC71z4lY_SeBJXdiFglQiYOSGZibrdo,9862
 openepd/model/specs/singular/mechanical_insulation.py,sha256=y39LcYM6nxJtVAv_Uzc4p4HiqfXMGuh1oiLJUJPG7t8,1607
 openepd/model/specs/singular/mixins/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/model/specs/singular/mixins/conduit_mixin.py,sha256=nC_xRz1aGFP-Pu7lk_ZC-LIe5ZB_VFIw5J7KbKlMlGo,1928
 openepd/model/specs/singular/network_infrastructure.py,sha256=zFJ1wjhtah-i39TPzmhFZ2IMvX3hiAIpFhmfSVWpk70,8521
-openepd/model/specs/singular/openings.py,sha256=KeMrAe1Tyq6WZp-JvRP3zjK6Ki8lOyFIP7HivyDo2lA,18890
+openepd/model/specs/singular/openings.py,sha256=4ROhnnKv3W9LwC21uCZLAgffto3L99A6Bt6n-6nkmPQ,18941
 openepd/model/specs/singular/other_electrical_equipment.py,sha256=HUOI_NfCXn_pmon0KEy11hBrILA5QYtpnme0YqWoEfk,814
 openepd/model/specs/singular/other_materials.py,sha256=ztaZHOr2HbiSpKdz4M1b2jsm_11fMDqZduEYWT1Q_rI,3498
 openepd/model/specs/singular/plumbing.py,sha256=Dr3lt23FkSbhCyeGDcW8FpyOr2MYvV2JwCZAdvLqz9I,4568
 openepd/model/specs/singular/precast_concrete.py,sha256=Qwnm49sCXXmPoIckIUwldDvUq760FzTVaYnFOV6XOEY,7327
-openepd/model/specs/singular/sheathing.py,sha256=ykt8oAs80IiZG5Ty1jKRxPgtz_7YF7eXOa0D_tu-gcs,3690
-openepd/model/specs/singular/steel.py,sha256=dMQwKWuDsY2Jr6BKWfsZqQJquwiWV3mGpd4grrBHz0Y,10236
+openepd/model/specs/singular/sheathing.py,sha256=e3y6XlDuSWF5ldN0NqfJCfB8VQMWciv5DnYKsp7cQzw,3709
+openepd/model/specs/singular/steel.py,sha256=IlYlp77hmweDQbLCluy-ltZgMT0-RNXNDnsRXyWE-8Q,10340
 openepd/model/specs/singular/thermal_moisture_protection.py,sha256=rwwxAj0TFKuI2jBbEPj4qpYVMVD6uqK-IyDPriJ8nAo,8195
 openepd/model/specs/singular/utility_piping.py,sha256=8Rs-5Xoe8mepH8nY7-a6zvAxPr1TKL2XJHpYDSy3atM,2483
-openepd/model/specs/singular/wood.py,sha256=YO-YjuluW49iTRvapjzSb3zpmnGmuwcD1ni97seOOas,6330
+openepd/model/specs/singular/wood.py,sha256=Bxf7LeodG0DQUdXiYgRWDeQtuYQ6Vpck4Uw4wF7tUzY,6591
 openepd/model/specs/singular/wood_joists.py,sha256=LWkm3s7yW0S-IN5oeoj6g99CdAdQvplvbjVIyezaZx0,1719
 openepd/model/standard.py,sha256=QhGpWN3U27fDcS0Yy1Dk8ElJfD0etet6i_PzoTD6B48,1318
 openepd/model/validation/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/model/validation/common.py,sha256=FLYqK8gYFagx08LCkS0jy3qo4-Zq9VAv5i8ZwF2svkc,2435
 openepd/model/validation/enum.py,sha256=06Fi2_sdjVhOElavtgvNXvkKU0NQ-bcAFx5_5MiDzdU,1793
 openepd/model/validation/numbers.py,sha256=J2rVMwJTPr8uC1DrU80xpq2SZGMXvVKx7v74SgOVi0U,851
-openepd/model/validation/quantity.py,sha256=8LbSn-Gfo6r1j6AKDjzPnt_9dwyXMFmN5Uaoxa6LIEU,16953
+openepd/model/validation/quantity.py,sha256=UP6x2nUj1nP7G8e2rpi-HigHx9rwKeCuIDh_XWFRU6U,20187
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/patch_pydantic.py,sha256=xrkzblatmU9HBzukWkp1cPq9ZSuohoz1p0pQqVKSlKs,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.0.0.dist-info/METADATA,sha256=nhKtUBMVGzjXg3QsNYrrVbJzM7HCdrHg828rW5IPwls,8996
-openepd-6.0.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.0.0.dist-info/RECORD,,
+openepd-6.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.0.1.dist-info/METADATA,sha256=3JfGfzrMlQ1wyxIDYQTZ-l1CDo8nruSGoQQCj7m-shc,8996
+openepd-6.0.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.0.1.dist-info/RECORD,,