openepd 5.3.0__py3-none-any.whl → 6.0.1__py3-none-any.whl

openepd/model/specs/range/steel.py

@@ -41,10 +41,15 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import SteelComposition, SteelRebarGrade
-from openepd.model.specs.generated.steel import SteelMakingRoute
+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/thermal_moisture_protection.py

@@ -44,7 +44,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FoamType,
     InsulatingMaterial,
     InsulationIntendedApplication,

openepd/model/specs/range/utility_piping.py

@@ -25,7 +25,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeAmount
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
+from openepd.model.specs.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 

openepd/model/specs/range/wood.py

@@ -32,11 +32,12 @@ __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.generated.enums import (
+from openepd.model.specs.enums import (
     AllFabrication,
     AllTimberSpecies,
     CompositeLumberFabrication,
@@ -45,6 +46,7 @@ from openepd.model.specs.generated.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/range/wood_joists.py

@@ -21,7 +21,7 @@ __all__ = ("WoodJoistsRangeV1",)
 from openepd.compat.pydantic import pyd
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AllFabrication, AllTimberSpecies
+from openepd.model.specs.enums import AllFabrication, AllTimberSpecies
 
 
 class WoodJoistsRangeV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/{generated → singular}/__init__.py

@@ -13,44 +13,46 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-
+from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.accessories import AccessoriesV1
-from openepd.model.specs.generated.aggregates import AggregatesV1
-from openepd.model.specs.generated.aluminium import AluminiumV1
-from openepd.model.specs.generated.asphalt import AsphaltV1
-from openepd.model.specs.generated.bulk_materials import BulkMaterialsV1
-from openepd.model.specs.generated.cast_decks_and_underlayment import CastDecksAndUnderlaymentV1
-from openepd.model.specs.generated.cladding import CladdingV1
-from openepd.model.specs.generated.cmu import CMUV1
-from openepd.model.specs.generated.concrete import ConcreteV1
-from openepd.model.specs.generated.conveying_equipment import ConveyingEquipmentV1
-from openepd.model.specs.generated.electrical import ElectricalV1
-from openepd.model.specs.generated.electrical_transmission_and_distribution_equipment import (
+from openepd.model.specs.singular.accessories import AccessoriesV1
+from openepd.model.specs.singular.aggregates import AggregatesV1
+from openepd.model.specs.singular.aluminium import AluminiumV1
+from openepd.model.specs.singular.asphalt import AsphaltV1
+from openepd.model.specs.singular.bulk_materials import BulkMaterialsV1
+from openepd.model.specs.singular.cast_decks_and_underlayment import CastDecksAndUnderlaymentV1
+from openepd.model.specs.singular.cladding import CladdingV1
+from openepd.model.specs.singular.cmu import CMUV1
+from openepd.model.specs.singular.concrete import ConcreteV1
+from openepd.model.specs.singular.conveying_equipment import ConveyingEquipmentV1
+from openepd.model.specs.singular.electrical import ElectricalV1
+from openepd.model.specs.singular.electrical_transmission_and_distribution_equipment import (
     ElectricalTransmissionAndDistributionEquipmentV1,
 )
-from openepd.model.specs.generated.electricity import ElectricityV1
-from openepd.model.specs.generated.finishes import FinishesV1
-from openepd.model.specs.generated.fire_and_smoke_protection import FireAndSmokeProtectionV1
-from openepd.model.specs.generated.furnishings import FurnishingsV1
-from openepd.model.specs.generated.grouting import GroutingV1
-from openepd.model.specs.generated.manufacturing_inputs import ManufacturingInputsV1
-from openepd.model.specs.generated.masonry import MasonryV1
-from openepd.model.specs.generated.material_handling import MaterialHandlingV1
-from openepd.model.specs.generated.mechanical import MechanicalV1
-from openepd.model.specs.generated.mechanical_insulation import MechanicalInsulationV1
-from openepd.model.specs.generated.network_infrastructure import NetworkInfrastructureV1
-from openepd.model.specs.generated.openings import OpeningsV1
-from openepd.model.specs.generated.other_electrical_equipment import OtherElectricalEquipmentV1
-from openepd.model.specs.generated.other_materials import OtherMaterialsV1
-from openepd.model.specs.generated.plumbing import PlumbingV1
-from openepd.model.specs.generated.precast_concrete import PrecastConcreteV1
-from openepd.model.specs.generated.sheathing import SheathingV1
-from openepd.model.specs.generated.steel import SteelV1
-from openepd.model.specs.generated.thermal_moisture_protection import ThermalMoistureProtectionV1
-from openepd.model.specs.generated.utility_piping import UtilityPipingV1
-from openepd.model.specs.generated.wood import WoodV1
-from openepd.model.specs.generated.wood_joists import WoodJoistsV1
+from openepd.model.specs.singular.electricity import ElectricityV1
+from openepd.model.specs.singular.finishes import FinishesV1
+from openepd.model.specs.singular.fire_and_smoke_protection import FireAndSmokeProtectionV1
+from openepd.model.specs.singular.furnishings import FurnishingsV1
+from openepd.model.specs.singular.grouting import GroutingV1
+from openepd.model.specs.singular.manufacturing_inputs import ManufacturingInputsV1
+from openepd.model.specs.singular.masonry import MasonryV1
+from openepd.model.specs.singular.material_handling import MaterialHandlingV1
+from openepd.model.specs.singular.mechanical import MechanicalV1
+from openepd.model.specs.singular.mechanical_insulation import MechanicalInsulationV1
+from openepd.model.specs.singular.network_infrastructure import NetworkInfrastructureV1
+from openepd.model.specs.singular.openings import OpeningsV1
+from openepd.model.specs.singular.other_electrical_equipment import OtherElectricalEquipmentV1
+from openepd.model.specs.singular.other_materials import OtherMaterialsV1
+from openepd.model.specs.singular.plumbing import PlumbingV1
+from openepd.model.specs.singular.precast_concrete import PrecastConcreteV1
+from openepd.model.specs.singular.sheathing import SheathingV1
+from openepd.model.specs.singular.steel import SteelV1
+from openepd.model.specs.singular.thermal_moisture_protection import ThermalMoistureProtectionV1
+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(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/{generated → singular}/aggregates.py

@@ -16,7 +16,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AggregateGradation, AggregateWeightClassification
+from openepd.model.specs.enums import AggregateGradation, AggregateWeightClassification
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr
 

openepd/model/specs/{generated → singular}/aluminium.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AluminiumAlloy
+from openepd.model.specs.enums import AluminiumAlloy
 
 
 class AluminiumBilletsV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/{generated → singular}/asphalt.py

@@ -13,9 +13,11 @@
 #  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.generated.enums import AsphaltGradation, AsphaltMixType
+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/{generated → singular}/cladding.py

@@ -15,7 +15,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.specs.enums import CladdingFacingMaterial, CladdingInsulatingMaterial, SidingFormFactor
 from openepd.model.validation.quantity import LengthMmStr, LengthMStr, RValueStr, validate_quantity_unit_factory
 
 

openepd/model/specs/{generated → singular}/cmu.py

@@ -13,9 +13,11 @@
 #  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.generated.enums import CmuBlockType, CmuWeightClassification
+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/{generated → singular}/concrete.py

@@ -18,7 +18,7 @@ from typing import Annotated, Literal
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.concrete import Cementitious, ConcreteTypicalApplication
-from openepd.model.specs.generated.enums import AciExposureClass, CsaExposureClass, EnExposureClass
+from openepd.model.specs.enums import AciExposureClass, CsaExposureClass, EnExposureClass
 from openepd.model.validation.enum import exclusive_groups_validator_factory
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import (

openepd/model/specs/{generated → singular}/conveying_equipment.py

@@ -15,7 +15,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.specs.enums import ElevatorsBuildingRise, ElevatorsUsageIntensity
 from openepd.model.validation.quantity import CapacityPerHourStr, LengthMStr, MassKgStr, SpeedStr
 
 

openepd/model/specs/{generated → singular}/electrical.py

@@ -15,8 +15,8 @@
 #
 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.specs.generated.mixins.conduit_mixin import ConduitMixin
+from openepd.model.specs.enums import CableTraysMaterial, EnergySource, RacewaysMaterial
+from openepd.model.specs.singular.mixins.conduit_mixin import ConduitMixin
 from openepd.model.validation.quantity import (
     ColorTemperatureStr,
     LengthMmStr,
@@ -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/{generated → singular}/finishes.py

@@ -15,8 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.common import HasForestPracticesCertifiers
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AccessFlooringCoreMaterial,
     AccessFlooringFinishMaterial,
     AccessFlooringSeismicRating,
@@ -43,13 +42,17 @@ from openepd.model.specs.generated.enums import (
     WoodFlooringFabrication,
     WoodFlooringTimberSpecies,
 )
+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/{generated → singular}/fire_and_smoke_protection.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     IntumescentFireproofingMaterialType,
     SprayFireproofingDensity,
     SprayFireproofingMaterialType,

openepd/model/specs/{generated → singular}/furnishings.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import CountertopMaterial
+from openepd.model.specs.enums import CountertopMaterial
 from openepd.model.validation.quantity import LengthMmStr
 
 

openepd/model/specs/{generated → singular}/manufacturing_inputs.py

@@ -16,7 +16,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.concrete import Cementitious
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AdmixtureEffects,
     CarpetYarnType,
     CementAstmType,

openepd/model/specs/{generated → 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/{generated → singular}/mechanical.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AhuAirflowControl,
     AhuZoneControl,
     AirFiltersMediaType,

openepd/model/specs/{generated → singular}/mechanical_insulation.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import InsulatingMaterial, InsulationIntendedApplication
+from openepd.model.specs.enums import InsulatingMaterial, InsulationIntendedApplication
 from openepd.model.validation.quantity import LengthMmStr
 
 

openepd/model/specs/{generated → singular}/mixins/conduit_mixin.py

@@ -17,7 +17,7 @@ __all__ = ["ConduitMixin"]
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdSpec
-from openepd.model.specs.generated.enums import ConduitMaterial
+from openepd.model.specs.enums import ConduitMaterial
 from openepd.model.validation.quantity import LengthMmStr
 
 

openepd/model/specs/{generated → singular}/network_infrastructure.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     CableTraysMaterial,
     CablingCategory,
     CablingFireRating,
@@ -27,7 +27,7 @@ from openepd.model.specs.generated.enums import (
     RacewaysMaterial,
     RackType,
 )
-from openepd.model.specs.generated.mixins.conduit_mixin import ConduitMixin
+from openepd.model.specs.singular.mixins.conduit_mixin import ConduitMixin
 from openepd.model.validation.quantity import (
     ElectricalCurrentStr,
     LengthMmStr,

openepd/model/specs/{generated → singular}/openings.py

@@ -17,7 +17,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FlatGlassPanesThickness,
     FrameMaterial,
     HardwareFunction,
@@ -26,7 +26,13 @@ from openepd.model.specs.generated.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/{generated → singular}/plumbing.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import FireProtectionPipingMaterial, PipingAnsiSchedule, PlumbingPipingMaterial
+from openepd.model.specs.enums import FireProtectionPipingMaterial, PipingAnsiSchedule, PlumbingPipingMaterial
 from openepd.model.validation.quantity import LengthMmStr, MassPerLengthStr
 
 

openepd/model/specs/{generated → singular}/sheathing.py

@@ -15,8 +15,8 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import GypsumFacing, GypsumFireRating, GypsumThickness
-from openepd.model.validation.quantity import LengthMmStr, validate_quantity_unit_factory
+from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
+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/{generated → singular}/steel.py

@@ -18,10 +18,16 @@ from typing import Annotated
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec, CodegenSpec
-from openepd.model.specs.generated.enums import SteelComposition, SteelRebarGrade
+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/{generated → singular}/thermal_moisture_protection.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FoamType,
     InsulatingMaterial,
     InsulationIntendedApplication,

openepd/model/specs/{generated → singular}/utility_piping.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
+from openepd.model.specs.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
 from openepd.model.validation.quantity import LengthMmStr, MassPerLengthStr