openepd 3.1.1__py3-none-any.whl → 3.1.3__py3-none-any.whl

openepd/__version__.py

@@ -17,4 +17,4 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-VERSION = "3.1.1"
+VERSION = "3.1.3"

openepd/compat/compat_functional_validators.py

@@ -0,0 +1,29 @@
+#
+#  Copyright 2024 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.
+#
+#  This software was developed with support from the Skanska USA,
+#  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
+#  Find out more at www.BuildingTransparency.org
+#
+from typing import Any
+
+__all__ = ["AfterValidator"]
+
+
+class AfterValidator:
+    """Placeholder stub for validator, unused in pydantic 1."""
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        pass

openepd/compat/pydantic.py

@@ -18,12 +18,17 @@
 #  Find out more at www.BuildingTransparency.org
 #
 try:
+    from pydantic import functional_validators  # type: ignore
     from pydantic import v1 as pyd  # type: ignore
     from pydantic.v1 import generics as pyd_generics  # type: ignore
+
 except ImportError:
     import pydantic as pyd  # type: ignore[no-redef]
     from pydantic import generics as pyd_generics  # type: ignore[no-redef]
 
+    from . import compat_functional_validators as functional_validators  # type: ignore[no-redef]
+
+
 pydantic = pyd
 
-__all__ = ["pyd", "pydantic", "pyd_generics"]
+__all__ = ["pyd", "pydantic", "pyd_generics", "functional_validators"]

openepd/model/specs/concrete.py

@@ -18,16 +18,11 @@
 #  Find out more at www.BuildingTransparency.org
 #
 from enum import StrEnum
-from typing import Literal
 
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
-from openepd.model.common import OpenEPDUnit
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec
-from openepd.model.specs.generated.enums import AciExposureClass, CsaExposureClass, EnExposureClass
-from openepd.model.validation.common import together_validator
+from openepd.model.specs.base import BaseOpenEpdSpec
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_unit_factory
 
 
 class CmuWeightClassification(StrEnum):
@@ -208,154 +203,3 @@ class ConcreteV1Options(BaseOpenEpdSchema):
     co2: bool | None = pyd.Field(description="CO2 Curing", default=None)
     white: bool | None = pyd.Field(description="White Cement", default=None)
     fiber_reinforced: bool | None = pyd.Field(description="Fiber reinforced", default=None)
-
-
-class ReadyMixV1(BaseOpenEpdHierarchicalSpec):
-    """Concretes to be mixed and then poured on-site."""
-
-    _EXT_VERSION = "1.0"
-
-
-class FlowableFillV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Flowable fill is a slurry that is placed as a flowable liquid (high slump) and sets with no compaction.
-
-    It is often used in tight or restricted access areas where placing and compacting
-    fill is difficult. Applications include filling large voids such as abandoned underground storage
-    tanks, basements, tunnels, mines, and sewers. It can also be used as paving sub-base, bridge
-    abutment, and retaining wall backfill. Also called Controlled Density Fill (CDF) or Controlled
-    Low Strength Materials (CLSMs). These materials typically have compressive strengths
-    under 1200 psi.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class OilPatchV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Concretes for use in petroleum extraction wells and similar applications.
-
-    Includes foamed cement; often called cement in the drilling industry. Differs from
-    flowable fill and grout in that it contains no sand or other aggregates.
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
-    """Concrete paving."""
-
-    _EXT_VERSION = "1.0"
-
-
-class ShotcreteV1(BaseOpenEpdHierarchicalSpec):
-    """Concretes sprayed on a target."""
-
-    _EXT_VERSION = "1.0"
-
-
-class CementGroutV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Cement grouting is a slurry that is placed as a flowable liquid.
-
-    It is an effective material for filling and
-    strengthening granular soils, voids in rocks, foundation underpinnings, and other underground voids. Also called
-    structural grout, these materials typically impart significant compressive strength to the system.
-
-    """
-
-    _EXT_VERSION = "1.0"
-
-
-class ConcreteV1(BaseOpenEpdHierarchicalSpec):
-    """Concrete spec."""
-
-    _EXT_VERSION = "1.0"
-
-    strength_28d: PressureMPaStr | None = pyd.Field(
-        default=None, example="30 MPa", description="Concrete strength after 28 days"
-    )
-    strength_early: PressureMPaStr | None = pyd.Field(
-        default=None,
-        example="30 MPa",
-        description="A strength spec which is to be reached earlier than 28 days (e.g. 3d)",
-    )
-    strength_early_d: Literal[3, 7, 14] | None = pyd.Field(default=None, description="Test Day for the Early Strength")
-    strength_late: PressureMPaStr | None = pyd.Field(
-        default=None,
-        example="30 MPa",
-        description="A strength spec which is to be reached later than 28 days (e.g. 42d)",
-    )
-    strength_late_d: Literal[42, 56, 72, 96, 120] | None = pyd.Field(
-        default=None, description="Test Day for the Late Strength"
-    )
-    slump: LengthMmStr | None = pyd.Field(description="Minimum test slump", example="40 mm", default=None)
-    w_c_ratio: RatioFloat | None = pyd.Field(description="Ratio of water to cement", example=0.3, default=None)
-    aci_exposure_classes: list[AciExposureClass] = pyd.Field(
-        description=(AciExposureClass.__doc__ or "").lstrip(), default_factory=list
-    )
-    csa_exposure_classes: list[CsaExposureClass] = pyd.Field(
-        description=(CsaExposureClass.__doc__ or "").lstrip(), default_factory=list
-    )
-    en_exposure_classes: list[EnExposureClass] = pyd.Field(
-        description=(EnExposureClass.__doc__ or "").lstrip(), default_factory=list
-    )
-    cementitious: Cementitious | None = pyd.Field(
-        default=None,
-        description="List of cementitious materials, and proportion by mass. Each field is 0 to 1.",
-    )
-    application: TypicalApplication | None = pyd.Field(description="Typical Application", default=None)
-    options: ConcreteV1Options | None = pyd.Field(description="Concrete options", default=None)
-
-    # Nested specs
-    ReadyMix: ReadyMixV1 | None = None
-    FlowableFill: FlowableFillV1 | None = None
-    OilPatch: OilPatchV1 | None = None
-    ConcretePaving: ConcretePavingV1 | None = None
-    Shotcrete: ShotcreteV1 | None = None
-    CementGrout: CementGroutV1 | None = None
-
-    _compressive_strength_unit_validator = pyd.validator("strength_28d", allow_reuse=True, check_fields=False)(
-        validate_unit_factory(OpenEPDUnit.MPa)
-    )
-    _strength_early_unit_validator = pyd.validator("strength_early", allow_reuse=True)(
-        validate_unit_factory(OpenEPDUnit.MPa)
-    )
-    _strength_late_unit_validator = pyd.validator("strength_late", allow_reuse=True)(
-        validate_unit_factory(OpenEPDUnit.MPa)
-    )
-
-    @pyd.root_validator
-    def _late_validator(cls, values):
-        together_validator("strength_late", "strength_late_d", values)
-        return values
-
-    @pyd.root_validator
-    def _early_validator(cls, values):
-        together_validator("strength_early", "strength_early_d", values)
-        return values
-
-
-class PrecastConcreteV1(BaseOpenEpdHierarchicalSpec):
-    """Precast Concrete spec."""
-
-    _EXT_VERSION = "1.0"
-
-    strength_28d: PressureMPaStr | None = pyd.Field(
-        default=None, example="30 MPa", description="Concrete strength after 28 days"
-    )
-
-    lightweight: bool | None = pyd.Field(description="Lightweight", default=None)
-    steel_mass_percentage: RatioFloat | None = pyd.Field(
-        default=None,
-        description="Percent of total mass that is steel reinforcement. Steel reinforcement "
-        "substantially changes functional performance and usually adds substantial GWP "
-        "per declared unit.",
-    )
-
-    insulated: bool | None = pyd.Field(description="Insulated", default=None)
-    gfrc: bool | None = pyd.Field(description="Glass Fiber Reinforced Concrete", default=None)
-
-    _compressive_strength_unit_validator = pyd.validator("strength_28d", allow_reuse=True)(
-        validate_unit_factory(OpenEPDUnit.MPa)
-    )

openepd/model/specs/generated/asphalt.py

@@ -21,7 +21,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import AsphaltGradation, AsphaltMixType
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, TemperatureCStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, TemperatureCStr
 
 
 class AsphaltV1(BaseOpenEpdHierarchicalSpec):
@@ -74,13 +74,3 @@ class AsphaltV1(BaseOpenEpdHierarchicalSpec):
     ppa: bool | None = pyd.Field(default=None, description="Polyphosphoric acid (PPA)", example=True)
     gtr: bool | None = pyd.Field(default=None, description="Ground tire rubber (GTR)", example=True)
     pmb: bool | None = pyd.Field(default=None, description="Polymer modified bitumen (PMB)", example=True)
-
-    _asphalt_aggregate_size_max_is_quantity_validator = pyd.validator("aggregate_size_max", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-    _asphalt_max_temperature_is_quantity_validator = pyd.validator("max_temperature", allow_reuse=True)(
-        validate_unit_factory("°C")
-    )
-    _asphalt_min_temperature_is_quantity_validator = pyd.validator("min_temperature", allow_reuse=True)(
-        validate_unit_factory("°C")
-    )

openepd/model/specs/generated/cladding.py

@@ -20,7 +20,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import CladdingFacingMaterial, CladdingInsulatingMaterial, SidingFormFactor
-from openepd.model.validation.quantity import LengthMmStr, LengthMStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, LengthMStr, RValueStr, validate_unit_factory
 
 
 class AluminiumSidingV1(BaseOpenEpdHierarchicalSpec):
@@ -126,13 +126,9 @@ class SidingV1(BaseOpenEpdHierarchicalSpec):
     insulated: bool | None = pyd.Field(default=None, description="", example=True)
     ventilated: bool | None = pyd.Field(default=None, description="", example=True)
     paint_or_stain_required: bool | None = pyd.Field(default=None, description="", example=True)
-    r_value: str | None = pyd.Field(default=None, description="", example="1 K * m2 / W")
+    r_value: RValueStr | None = pyd.Field(default=None, description="")
     form_factor: SidingFormFactor | None = pyd.Field(default=None, description="", example="Lap")
 
-    _siding_r_value_is_quantity_validator = pyd.validator("r_value", allow_reuse=True)(
-        validate_unit_factory("K * m2 / W")
-    )
-
     # Nested specs:
     MetalSiding: MetalSidingV1 | None = None
     CompositionSiding: CompositionSidingV1 | None = None
@@ -150,15 +146,11 @@ class InsulatedRoofPanelsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    r_value: str | None = pyd.Field(default=None, description="", example="1 K * m2 / W")
+    r_value: RValueStr | None = pyd.Field(default=None, description="")
     insulating_material: CladdingInsulatingMaterial | None = pyd.Field(
         default=None, description="", example="No Insulation"
     )
 
-    _cladding_r_value_is_quantity_validator = pyd.validator("r_value", allow_reuse=True)(
-        validate_unit_factory("K * m2 / W")
-    )
-
 
 class InsulatedWallPanelsV1(BaseOpenEpdHierarchicalSpec):
     """Insulated wall panels performance specification."""
@@ -166,15 +158,11 @@ class InsulatedWallPanelsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    r_value: str | None = pyd.Field(default=None, description="", example="1 K * m2 / W")
+    r_value: RValueStr | None = pyd.Field(default=None, description="")
     insulating_material: CladdingInsulatingMaterial | None = pyd.Field(
         default=None, description="", example="No Insulation"
     )
 
-    _cladding_r_value_is_quantity_validator = pyd.validator("r_value", allow_reuse=True)(
-        validate_unit_factory("K * m2 / W")
-    )
-
 
 class RoofPanelsV1(BaseOpenEpdHierarchicalSpec):
     """Roof panels performance specification."""

openepd/model/specs/generated/cmu.py

@@ -20,7 +20,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import CmuBlockType, CmuWeightClassification
-from openepd.model.validation.quantity import GwpKgCo2eStr, PressureMPaStr, validate_unit_factory
+from openepd.model.validation.quantity import GwpKgCo2eStr, PressureMPaStr
 
 
 class CMUV1(BaseOpenEpdHierarchicalSpec):
@@ -37,10 +37,3 @@ class CMUV1(BaseOpenEpdHierarchicalSpec):
     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)
-
-    _concrete_compressive_strength_28d_is_quantity_validator = pyd.validator("strength_28d", allow_reuse=True)(
-        validate_unit_factory("MPa")
-    )
-    _b1_recarbonation_is_quantity_validator = pyd.validator("b1_recarbonation", allow_reuse=True)(
-        validate_unit_factory("kgCO2e")
-    )

openepd/model/specs/generated/concrete.py

@@ -34,19 +34,26 @@ from openepd.model.validation.quantity import (
 
 
 class CementGroutV1(BaseOpenEpdHierarchicalSpec):
-    """Cement grout performance specification."""
+    """
+    Cement grout performance specification.
+
+    Cement grouting is a slurry that is placed as a flowable liquid. It is an effective material
+    for filling and strengthening granular soils, voids in rocks, foundation underpinnings, and
+    other underground voids. Also called structural grout, these materials typically impart
+    significant compressive strength to the system.
+    """
 
     _EXT_VERSION = "1.0"
 
 
 class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
-    """Concrete paving performance specification."""
+    """Concrete paving."""
 
     _EXT_VERSION = "1.0"
 
     # Own fields:
     flexion_strength: PressureMPaStr | None = pyd.Field(
-        default=None, description="Paving flexion strength", example="30 MPa"
+        default=None, description="Concrete flexural strength.", example="30 MPa"
     )
 
     _concrete_flexion_strength_is_quantity_validator = pyd.validator("flexion_strength", allow_reuse=True)(
@@ -55,36 +62,58 @@ class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
 
 
 class FlowableFillV1(BaseOpenEpdHierarchicalSpec):
-    """Flowable fill performance specification."""
+    """
+    Flowable fill performance specification.
+
+    Flowable fill is a slurry that is placed as a flowable liquid (high slump) and sets with no
+    compaction. It is often used in tight or restricted access areas where placing and compacting
+    fill is difficult. Applications include filling large voids such as abandoned underground storage
+    tanks, basements, tunnels, mines, and sewers. It can also be used as paving sub-base, bridge
+    abutment, and retaining wall backfill.
+
+    Also called Controlled Density Fill (CDF) or Controlled Low Strength Materials (CLSMs). These materials typically
+    have compressive strengths under 1200 psi.
+    """
 
     _EXT_VERSION = "1.0"
 
 
 class OilPatchV1(BaseOpenEpdHierarchicalSpec):
-    """Oil patch performance specification."""
+    """
+    Petroleum Industry Cement Slurry.
+
+    Concretes for use in creation, maintenance, and decommissioning of petroleum extraction wells and similar
+    applications. Includes foamed cement; often called cement in the drilling industry. Differs from
+    flowable fill and grout in that it contains no sand or other aggregates.
+    """
 
     _EXT_VERSION = "1.0"
 
 
 class ReadyMixV1(BaseOpenEpdHierarchicalSpec):
-    """Concretes that are mixed just before use, and then poured on-site into forms."""
+    """Concretes to be mixed and then poured on-site."""
 
     _EXT_VERSION = "1.0"
 
 
 class ShotcreteV1(BaseOpenEpdHierarchicalSpec):
-    """Shotcrete performance specification."""
+    """Concretes sprayed on a target."""
 
     _EXT_VERSION = "1.0"
 
 
 class ConcreteV1(BaseOpenEpdHierarchicalSpec):
-    """Concrete performance specification."""
+    """
+    Concrete.
+
+    A composite material composed of fine and coarse aggregate bonded together with a fluid cement (cement paste) that
+    hardens over time.
+    """
 
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    lightweight: bool | None = pyd.Field(default=None, description="Lightweight", example=True)
+    lightweight: bool | None = pyd.Field(default=None, description="Product is lightweight", example=True)
 
     strength_28d: PressureMPaStr | None = pyd.Field(
         default=None, description="Concrete strength after 28 days", example="1 MPa"
@@ -95,14 +124,16 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
         example="30 MPa",
     )
     strength_other_d: Literal[3, 7, 14, 42, 56, 72, 96, 120] | None = pyd.Field(
-        default=None, description="Test Day for the Late Strength", example=42
+        default=None, description="Test Day for strength_other", example=42
     )
 
     slump: LengthInchStr | None = pyd.Field(default=None, description="", example="2 in")
     min_slump: LengthInchStr | None = pyd.Field(default=None, description="Minimum test slump", example="2 in")
     max_slump: LengthInchStr | None = pyd.Field(default=None, description="", example="2 in")
 
-    min_pipeline_size: LengthMmStr | None = pyd.Field(default=None, description="", example="200 mm")
+    min_pipeline_size: LengthMmStr | None = pyd.Field(
+        default=None, description="Minimum pipeline size", example="200 mm"
+    )
     w_c_ratio: RatioFloat | None = pyd.Field(
         default=None, description="Ratio of water to cement", example=0.5, ge=0, le=1
     )
@@ -114,33 +145,28 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
     finishable: bool | None = pyd.Field(default=None, description="Finishable", example=True)
     fiber_reinforced: bool | None = pyd.Field(default=None, description="fiber_reinforced", example=True)
 
-    cementitious: Cementitious | None = pyd.Field(default=None, description="")
-
-    aggregate_size_max: LengthMmStr | None = pyd.Field(default=None, description="", example="0.0254 m")
-    cement_content: MassKgStr | None = pyd.Field(default=None, description="", example="1 kg")
-    aci_exposure_classes: list[AciExposureClass] | None = pyd.Field(default=None, description="", example=["aci.F0"])
-    csa_exposure_classes: list[CsaExposureClass] | None = pyd.Field(default=None, description="", example=["csa.C-2"])
-    en_exposure_classes: list[EnExposureClass] | None = pyd.Field(default=None, description="", example=["en206.X0"])
-    typical_application: ConcreteTypicalApplication | None = pyd.Field(default=None, description="Typical Application")
-
-    _concrete_compressive_strength_28d_is_quantity_validator = pyd.validator("strength_28d", allow_reuse=True)(
-        validate_unit_factory("MPa")
+    cementitious: Cementitious | None = pyd.Field(
+        default=None, description="List of cementitious materials, and proportion by mass"
     )
-    _concrete_compressive_strength_other_is_quantity_validator = pyd.validator("strength_other", allow_reuse=True)(
-        validate_unit_factory("MPa")
+
+    aggregate_size_max: LengthMmStr | None = pyd.Field(
+        default=None,
+        description="The smallest sieve size for which the entire amount of aggregate is able to pass. "
+        "Parameter describes diameter of aggregate",
+        example="8 mm",
     )
-    _concrete_slump_is_quantity_validator = pyd.validator("slump", allow_reuse=True)(validate_unit_factory("m"))
-    _concrete_min_slump_is_quantity_validator = pyd.validator("min_slump", allow_reuse=True)(validate_unit_factory("m"))
-    _concrete_max_slump_is_quantity_validator = pyd.validator("max_slump", allow_reuse=True)(validate_unit_factory("m"))
-    _concrete_min_pipeline_size_is_quantity_validator = pyd.validator("min_pipeline_size", allow_reuse=True)(
-        validate_unit_factory("m")
+    cement_content: MassKgStr | None = pyd.Field(default=None, example="1 kg")
+
+    aci_exposure_classes: list[AciExposureClass] | None = pyd.Field(
+        default=None, description="List of ACI exposure classes", example=["aci.F0"]
     )
-    _concrete_aggregate_size_max_is_quantity_validator = pyd.validator("aggregate_size_max", allow_reuse=True)(
-        validate_unit_factory("m")
+    csa_exposure_classes: list[CsaExposureClass] | None = pyd.Field(
+        default=None, description="List of CSA exposure classes", example=["csa.C-2"]
     )
-    _concrete_cement_content_is_quantity_validator = pyd.validator("cement_content", allow_reuse=True)(
-        validate_unit_factory("kg")
+    en_exposure_classes: list[EnExposureClass] | None = pyd.Field(
+        default=None, description="List of EN exposure classes", example=["en206.X0"]
     )
+    typical_application: ConcreteTypicalApplication | None = pyd.Field(default=None, description="Typical Application")
 
     # Nested specs:
     CementGrout: CementGroutV1 | None = None

openepd/model/specs/generated/conveying_equipment.py

@@ -20,7 +20,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import ElevatorsBuildingRise, ElevatorsUsageIntensity
-from openepd.model.validation.quantity import LengthMStr, MassKgStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMStr, MassKgStr, SpeedStr
 
 
 class ElevatorsV1(BaseOpenEpdHierarchicalSpec):
@@ -34,19 +34,9 @@ class ElevatorsV1(BaseOpenEpdHierarchicalSpec):
     )
     travel_length: LengthMStr | None = pyd.Field(default=None, description="", example="1 m")
     rated_load: MassKgStr | None = pyd.Field(default=None, description="", example="1 kg")
-    rated_speed: str | None = pyd.Field(default=None, description="", example="1 m / s")
+    rated_speed: SpeedStr | None = pyd.Field(default=None, description="", example="1 m / s")
     building_rise: ElevatorsBuildingRise | None = pyd.Field(default=None, description="", example="Low-rise")
 
-    _elevators_travel_length_is_quantity_validator = pyd.validator("travel_length", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-    _elevators_rated_load_is_quantity_validator = pyd.validator("rated_load", allow_reuse=True)(
-        validate_unit_factory("kg")
-    )
-    _elevators_rated_speed_is_quantity_validator = pyd.validator("rated_speed", allow_reuse=True)(
-        validate_unit_factory("m / s")
-    )
-
 
 class ConveyingEquipmentV1(BaseOpenEpdHierarchicalSpec):
     """Conveying equipment performance specification."""

openepd/model/specs/generated/electrical.py

@@ -21,10 +21,12 @@ from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import CableTraysMaterial, EnergySource, RacewaysMaterial
 from openepd.model.validation.quantity import (
+    ColorTemperatureStr,
     LengthMmStr,
     LengthMStr,
+    LuminosityStr,
     MassKgStr,
-    TemperatureCStr,
+    PowerStr,
     validate_quantity_ge_factory,
     validate_quantity_le_factory,
     validate_unit_factory,
@@ -70,11 +72,6 @@ class CableTraysV1(BaseOpenEpdHierarchicalSpec):
     )
     cable_trays_material: CableTraysMaterial | None = pyd.Field(default=None, description="", example="Stainless Steel")
 
-    _height_is_quantity_validator = pyd.validator("height", allow_reuse=True)(validate_unit_factory("m"))
-    _width_is_quantity_validator = pyd.validator("width", allow_reuse=True)(validate_unit_factory("m"))
-    _depth_is_quantity_validator = pyd.validator("depth", allow_reuse=True)(validate_unit_factory("m"))
-    _static_load_is_quantity_validator = pyd.validator("static_load", allow_reuse=True)(validate_unit_factory("kg"))
-
 
 class ElectricalBusesV1(BaseOpenEpdHierarchicalSpec):
     """Electrical buses performance specification."""
@@ -110,9 +107,6 @@ class RacewaysV1(BaseOpenEpdHierarchicalSpec):
     divided: bool | None = pyd.Field(default=None, description="", example=True)
     raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
 
-    _width_is_quantity_validator = pyd.validator("width", allow_reuse=True)(validate_unit_factory("m"))
-    _depth_is_quantity_validator = pyd.validator("depth", allow_reuse=True)(validate_unit_factory("m"))
-
 
 class FueledElectricalGeneratorsV1(BaseOpenEpdHierarchicalSpec):
     """Fueled electrical generators performance specification."""
@@ -250,10 +244,10 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    color_temperature: TemperatureCStr | None = pyd.Field(default=None, description="", example="1 K")
+    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")
-    luminosity: str | None = pyd.Field(default=None, description="", example="1 lumen")
-    wattage: str | None = pyd.Field(default=None, description="", example="1000.0 W")
+    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)
     dimmable: bool | None = pyd.Field(default=None, description="", example=True)
 
@@ -263,6 +257,9 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     _color_temperature_quantity_le_validator = pyd.validator("color_temperature", allow_reuse=True)(
         validate_quantity_le_factory("1E+04 K")
     )
+    _typical_utilization_unit_validator = pyd.validator("typical_utilization", allow_reuse=True)(
+        validate_unit_factory("h / yr")
+    )
     _typical_utilization_quantity_ge_validator = pyd.validator("typical_utilization", allow_reuse=True)(
         validate_quantity_ge_factory("25 h / yr")
     )

openepd/model/specs/generated/enums.py

@@ -372,14 +372,14 @@ class FrameMaterial(StrEnum):
     """
     Frame material.
 
-     - Vinyl: Vinyl
-     - Aluminium: Aluminium
-     - Steel: Steel
-     - Wood: Wood
-     - Fiberglass: Fiberglass
-     - Composite: Composite
-     - None: None
-     - Other: Other
+     - Vinyl: PVC and similar polymer frames
+     - Aluminium: Aluminium, with optional thermal improvement. Does not include aluminium clad.
+     - Steel: Steel, with optional thermal improvement
+     - Wood: Wood with optional cladding
+     - Fiberglass: Fiber reinforced plastic
+     - Composite: Plastic and Wood Fiber composite.
+     - None: This EPD does not cover the frame.
+     - Other: Other framing material not listed
 
     """
 
@@ -1793,12 +1793,12 @@ class HardwareFunction(StrEnum):
     """
     Hardware function.
 
-     - Lock: Lock
-     - Hinge: Hinge
-     - Handle: Handle
-     - Operator: Operator
-     - Balance: Balance
-     - Other: Other
+     - Lock: Locks, Keepers, and similar items that resist opening.
+     - Hinge: Hinges, Pivots, and similar items that secure glazing to the frame while it moves.
+     - Handle: Handles, knobs, and similar items for directly manipulating a window.
+     - Operator: Arms, Cranks, and other hardware that moves a window.
+     - Balance: Springs, Sash Balances, and other items that counter the weight of an operable sash.
+     - Other: Other hardware not described above.
 
     """
 
@@ -1975,11 +1975,17 @@ class ThermalSeparation(StrEnum):
     """
     Thermal separation.
 
-     - Aluminium: Aluminium
-     - Steel: Steel
-     - Thermally Improved Metal: Thermally Improved Metal
-     - Thermally Broken Metal: Thermally Broken Metal
-     - Nonmetal: Nonmetal
+     - Aluminium: Aluminium System members with less than 1.6 mm (0.062 in) or no separation between metal or system
+       members to provide a resistance heat transfer path from exterior to interior.
+     - Steel: Steel System members with less than 1.6 mm (0.062 in) or no separation between metal or system members to
+       provide a resistance heat transfer path from exterior to interior.
+     - Thermally Improved Metal: Metal System members with a separation ≥ 1.60 mm (0.062 in) provided by either a
+       thermal break or open air space that may be interrupted by short thermal bridges between the interior and
+       exterior surfaces.
+     - Thermally Broken Metal: Aluminium System members with a minimum of 5.30 mm (0.210 in) separation provided by
+       a thermal break.
+     - Nonmetal: Nonmetal material where the path from inside to outside inherently has low thermal conductivity,
+       such as wood, vinyl, and fiberglass. Aluminium-clad or split windows fall in this category.
 
     """
 
@@ -2376,7 +2382,7 @@ class FlatGlassPanesThickness(StrEnum):
 
 
 class NAFSPerformanceGrade(StrEnum):
-    """NAFS Performance Grade enum."""
+    """NAFS Performance Grade."""
 
     GRADE_15_PSF = "15 psf"
     GRADE_20_PSF = "20 psf"