openepd 6.0.0__tar.gz → 6.1.0__tar.gz

{openepd-6.0.0 → openepd-6.1.0}/PKG-INFO

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

{openepd-6.0.0 → openepd-6.1.0}/pyproject.toml

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

{openepd-6.0.0 → openepd-6.1.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.0.0"
+VERSION = "6.1.0"

{openepd-6.0.0 → openepd-6.1.0}/src/openepd/bundle/model.py

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from datetime import datetime
 from enum import StrEnum
 
 from openepd.compat.pydantic import pyd
@@ -61,6 +62,8 @@ class BundleManifest(BaseOpenEpdSchema):
     """The generator of the bundle."""
     assets: BundleManifestAssetsStats = pyd.Field(default_factory=BundleManifestAssetsStats)
     comment: str | None = pyd.Field(default=None)
+    created_at: datetime = pyd.Field(default_factory=datetime.utcnow)
+    """The date and time when the bundle was generated."""
 
 
 class AssetInfo(BaseOpenEpdSchema):

{openepd-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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-6.0.0 → openepd-6.1.0}/src/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