openepd 3.1.2__py3-none-any.whl → 3.1.4__py3-none-any.whl

openepd/model/specs/generated/mechanical.py

@@ -31,7 +31,7 @@ from openepd.model.specs.generated.enums import (
     MechanicalInstallation,
     MechanicalRefrigerants,
 )
-from openepd.model.validation.quantity import PressureMPaStr, validate_unit_factory
+from openepd.model.validation.quantity import AirflowStr, FlowRateStr, PowerStr, PressureMPaStr, VolumeStr
 
 
 class HvacVrfControlV1(BaseOpenEpdHierarchicalSpec):
@@ -47,21 +47,10 @@ class HvacVrfIndoorV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    cooling_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    airflow_rate: str | None = pyd.Field(default=None, description="", example="1 m3 / s")
-    air_volume: str | None = pyd.Field(default=None, description="", example="1 m3")
-
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _cooling_capacity_is_quantity_validator = pyd.validator("cooling_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _airflow_rate_is_quantity_validator = pyd.validator("airflow_rate", allow_reuse=True)(
-        validate_unit_factory("m3 / s")
-    )
-    _air_volume_is_quantity_validator = pyd.validator("air_volume", allow_reuse=True)(validate_unit_factory("m3"))
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    cooling_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    airflow_rate: AirflowStr | None = pyd.Field(default=None, description="", example="1 m3 / s")
+    air_volume: VolumeStr | None = pyd.Field(default=None, description="", example="1 m3")
 
 
 class HvacVrfOutdoorV1(BaseOpenEpdHierarchicalSpec):
@@ -71,21 +60,10 @@ class HvacVrfOutdoorV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    cooling_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    airflow_rate: str | None = pyd.Field(default=None, description="", example="1 m3 / s")
-    air_volume: str | None = pyd.Field(default=None, description="", example="1 m3")
-
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _cooling_capacity_is_quantity_validator = pyd.validator("cooling_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _airflow_rate_is_quantity_validator = pyd.validator("airflow_rate", allow_reuse=True)(
-        validate_unit_factory("m3 / s")
-    )
-    _air_volume_is_quantity_validator = pyd.validator("air_volume", allow_reuse=True)(validate_unit_factory("m3"))
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    cooling_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    airflow_rate: AirflowStr | None = pyd.Field(default=None, description="", example="1 m3 / s")
+    air_volume: VolumeStr | None = pyd.Field(default=None, description="", example="1 m3")
 
 
 class HvacAirDiffusersV1(BaseOpenEpdHierarchicalSpec):
@@ -112,24 +90,13 @@ class HvacAHUsV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
     installation: MechanicalInstallation | None = pyd.Field(default=None, description="", example="Indoor")
-    airflow_rate: str | None = pyd.Field(default=None, description="", example="1 m3 / s")
-    air_volume: str | None = pyd.Field(default=None, description="", example="1 m3")
-    cooling_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
+    airflow_rate: AirflowStr | None = pyd.Field(default=None, description="", example="1 m3 / s")
+    air_volume: VolumeStr | None = pyd.Field(default=None, description="", example="1 m3")
+    cooling_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
     airflow_control: AhuAirflowControl | None = pyd.Field(default=None, description="", example="CAV")
     zone_control: AhuZoneControl | None = pyd.Field(default=None, description="", example="Single Zone")
 
-    _airflow_rate_is_quantity_validator = pyd.validator("airflow_rate", allow_reuse=True)(
-        validate_unit_factory("m3 / s")
-    )
-    _air_volume_is_quantity_validator = pyd.validator("air_volume", allow_reuse=True)(validate_unit_factory("m3"))
-    _cooling_capacity_is_quantity_validator = pyd.validator("cooling_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-
 
 class HvacBoilersV1(BaseOpenEpdHierarchicalSpec):
     """Hvac boilers performance specification."""
@@ -137,16 +104,11 @@ class HvacBoilersV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    flow_rate: str | None = pyd.Field(default=None, description="", example="1 l / min")
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
+    flow_rate: FlowRateStr | None = pyd.Field(default=None, description="", example="1 l / min")
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
     configuration: BoilerConfiguration | None = pyd.Field(default=None, description="", example="Hot water")
     fuel_type: BoilerEquipmentFuelType | None = pyd.Field(default=None, description="", example="Coal")
 
-    _flow_rate_is_quantity_validator = pyd.validator("flow_rate", allow_reuse=True)(validate_unit_factory("l / min"))
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-
 
 class HvacChillersV1(BaseOpenEpdHierarchicalSpec):
     """Hvac chillers performance specification."""
@@ -156,21 +118,10 @@ class HvacChillersV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
     installation: MechanicalInstallation | None = pyd.Field(default=None, description="", example="Indoor")
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    cooling_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    air_volume: str | None = pyd.Field(default=None, description="", example="1 m3")
-    airflow_rate: str | None = pyd.Field(default=None, description="", example="1 m3 / s")
-
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _cooling_capacity_is_quantity_validator = pyd.validator("cooling_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _air_volume_is_quantity_validator = pyd.validator("air_volume", allow_reuse=True)(validate_unit_factory("m3"))
-    _airflow_rate_is_quantity_validator = pyd.validator("airflow_rate", allow_reuse=True)(
-        validate_unit_factory("m3 / s")
-    )
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    cooling_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    air_volume: VolumeStr | None = pyd.Field(default=None, description="", example="1 m3")
+    airflow_rate: AirflowStr | None = pyd.Field(default=None, description="", example="1 m3 / s")
 
 
 class HvacFansV1(BaseOpenEpdHierarchicalSpec):
@@ -186,23 +137,12 @@ class HvacHeatPumpsV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    cooling_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    heating_capacity: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-    air_volume: str | None = pyd.Field(default=None, description="", example="1 m3")
-    airflow_rate: str | None = pyd.Field(default=None, description="", example="1 m3 / s")
+    cooling_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    heating_capacity: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    air_volume: VolumeStr | None = pyd.Field(default=None, description="", example="1 m3")
+    airflow_rate: AirflowStr | None = pyd.Field(default=None, description="", example="1 m3 / s")
     heat_pumps_type: HeatPumpType | None = pyd.Field(default=None, description="", example="Air-to-Water")
 
-    _cooling_capacity_is_quantity_validator = pyd.validator("cooling_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _heating_capacity_is_quantity_validator = pyd.validator("heating_capacity", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
-    _air_volume_is_quantity_validator = pyd.validator("air_volume", allow_reuse=True)(validate_unit_factory("m3"))
-    _airflow_rate_is_quantity_validator = pyd.validator("airflow_rate", allow_reuse=True)(
-        validate_unit_factory("m3 / s")
-    )
-
 
 class HvacHeatExV1(BaseOpenEpdHierarchicalSpec):
     """Hvac heat exchangers performance specification."""
@@ -222,17 +162,9 @@ class HvacPumpsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    flow_rate: str | None = pyd.Field(default=None, description="", example="1 l / min")
+    flow_rate: FlowRateStr | None = pyd.Field(default=None, description="", example="1 l / min")
     pump_discharge_pressure: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    pump_horsepower: str | None = pyd.Field(default=None, description="", example="1000.0 W")
-
-    _flow_rate_is_quantity_validator = pyd.validator("flow_rate", allow_reuse=True)(validate_unit_factory("l / min"))
-    _pump_discharge_pressure_is_quantity_validator = pyd.validator("pump_discharge_pressure", allow_reuse=True)(
-        validate_unit_factory("MPa")
-    )
-    _pump_horsepower_is_quantity_validator = pyd.validator("pump_horsepower", allow_reuse=True)(
-        validate_unit_factory("W")
-    )
+    pump_horsepower: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
 
 
 class HvacRTUsV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/generated/mechanical_insulation.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 InsulatingMaterial, InsulationIntendedApplication
-from openepd.model.validation.quantity import LengthMmStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr
 
 
 class MechanicalInsulationV1(BaseOpenEpdHierarchicalSpec):
@@ -35,7 +35,3 @@ class MechanicalInsulationV1(BaseOpenEpdHierarchicalSpec):
         default=None, description="", example=["Wall & General"]
     )
     thickness_per_declared_unit: LengthMmStr | None = pyd.Field(default=None, description="", example="20 mm")
-
-    _thickness_per_declared_unit_is_quantity_validator = pyd.validator("thickness_per_declared_unit", allow_reuse=True)(
-        validate_unit_factory("m")
-    )

openepd/model/specs/generated/network_infrastructure.py

@@ -31,7 +31,7 @@ from openepd.model.specs.generated.enums import (
     RacewaysMaterial,
     RackType,
 )
-from openepd.model.validation.quantity import LengthMmStr, MassKgStr, validate_unit_factory
+from openepd.model.validation.quantity import ElectricalCurrentStr, LengthMmStr, MassKgStr, validate_unit_factory
 
 
 class PDUV1(BaseOpenEpdHierarchicalSpec):
@@ -40,7 +40,7 @@ class PDUV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    amperage: str | None = pyd.Field(default=None, description="", example="1 A")
+    amperage: ElectricalCurrentStr | None = pyd.Field(default=None, description="", example="1 A")
     outlet_level_metering: bool | None = pyd.Field(default=None, description="", example=True)
     outlet_level_switching: bool | None = pyd.Field(default=None, description="", example=True)
     pdu_technology: PduTechnology | None = pyd.Field(default=None, description="", example="Basic")
@@ -59,8 +59,6 @@ class CabinetsRacksAndEnclosuresV1(BaseOpenEpdHierarchicalSpec):
     total_racking_units: int | None = pyd.Field(default=None, description="", example=3)
     rack_type: RackType | None = pyd.Field(default=None, description="", example="Cabinet")
 
-    _static_load_is_quantity_validator = pyd.validator("static_load", allow_reuse=True)(validate_unit_factory("kg"))
-
 
 class DataCablingV1(BaseOpenEpdHierarchicalSpec):
     """Data cabling performance specification."""
@@ -141,11 +139,6 @@ class NetworkingCableTraysV1(BaseOpenEpdHierarchicalSpec):
     )
     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 NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     """Networking raceways performance specification."""
@@ -163,9 +156,6 @@ class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     )
     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 NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):
     """Network infrastructure performance specification."""

openepd/model/specs/generated/openings.py

@@ -30,7 +30,7 @@ from openepd.model.specs.generated.enums import (
     ThermalSeparation,
 )
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, SpeedStr, validate_unit_factory
 
 
 class GlazingIntendedApplication(BaseOpenEpdSchema):
@@ -355,10 +355,10 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
         description="Weighted average conductance of heat across assembly (including frame).",
         example="1 USI",
     )
-    air_infiltration: str | None = pyd.Field(
+    air_infiltration: SpeedStr | None = pyd.Field(
         default=None,
         description="Air infiltration, measured at a certain level of Differential Pressure.",
-        example="1 m / s",
+        example="1 m3 / m2 / s",
     )
 
     thermal_separation: ThermalSeparation | None = pyd.Field(default=None, example="Aluminium")
@@ -386,10 +386,6 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
     _assembly_u_factor_is_quantity_validator = pyd.validator("assembly_u_factor", allow_reuse=True)(
         validate_unit_factory("USI")
     )
-    _air_infiltration_is_quantity_validator = pyd.validator("air_infiltration", allow_reuse=True)(
-        validate_unit_factory("m / s")
-    )
-    _dp_rating_is_quantity_validator = pyd.validator("dp_rating", allow_reuse=True)(validate_unit_factory("MPa"))
     _nafs_performance_grade_is_quantity_validator = pyd.validator("performance_grade", allow_reuse=True)(
         validate_unit_factory("psf")
     )
@@ -415,10 +411,10 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
     dp_rating: PressureMPaStr | None = pyd.Field(
         default=None, description="Maximum Differential Pressure, a measure of wind tolerance.", example="1 MPa"
     )
-    air_infiltration: str | None = pyd.Field(
+    air_infiltration: SpeedStr | None = pyd.Field(
         default=None,
         description="Air infiltration, measured at a certain level of Differential Pressure.",
-        example="1 m / s",
+        example="1 m3 / m2 / s",
     )
     glass_panes: int | None = pyd.Field(
         default=None,
@@ -432,9 +428,6 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
         default=None, description="Spacer material for Integrated Glass Unit.", example="Aluminium"
     )
 
-    _air_infiltration_is_quantity_validator = pyd.validator("air_infiltration", allow_reuse=True)(
-        validate_unit_factory("m / s")
-    )
     _dp_rating_is_quantity_validator = pyd.validator("dp_rating", allow_reuse=True)(validate_unit_factory("MPa"))
     _cog_u_factor_is_quantity_validator = pyd.validator("cog_u_factor", allow_reuse=True)(validate_unit_factory("USI"))
 
@@ -462,9 +455,6 @@ class DoorsAndFramesV1(BaseOpenEpdHierarchicalSpec):
     height: LengthMmStr | None = pyd.Field(default=None, example="1200 mm")
     width: LengthMmStr | None = pyd.Field(default=None, example="600 mm")
 
-    _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"))
-
     # Nested specs:
     IntegratedDoorsOpeningAssemblies: IntegratedDoorsOpeningAssembliesV1 | None = None
     MetalDoorAndFrames: MetalDoorAndFramesV1 | None = None
@@ -541,8 +531,6 @@ class OpeningsV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     thickness: LengthMmStr | None = pyd.Field(default=None, example="80 mm")
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
-
     # Nested specs:
     CurtainWalls: CurtainWallsV1 | None = None
     DoorsAndFrames: DoorsAndFramesV1 | None = None

openepd/model/specs/generated/plumbing.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 FireProtectionPipingMaterial, PipingAnsiSchedule, PlumbingPipingMaterial
-from openepd.model.validation.quantity import LengthMmStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, MassPerLengthStr
 
 
 class BathtubsV1(BaseOpenEpdHierarchicalSpec):
@@ -55,20 +55,12 @@ class FireProtectionPipingV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="6 mm")
     piping_diameter: LengthMmStr | None = pyd.Field(default=None, description="", example="120 mm")
-    mass_per_unit_length: str | None = pyd.Field(default=None, description="", example="1 kg / m")
+    mass_per_unit_length: MassPerLengthStr | None = pyd.Field(default=None, description="", example="1 kg / m")
     piping_ansi_schedule: PipingAnsiSchedule | None = pyd.Field(default=None, description="", example="5")
     fire_protection_piping_material: FireProtectionPipingMaterial | None = pyd.Field(
         default=None, description="", example="PVC"
     )
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
-    _piping_diameter_is_quantity_validator = pyd.validator("piping_diameter", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-    _mass_per_unit_length_is_quantity_validator = pyd.validator("mass_per_unit_length", allow_reuse=True)(
-        validate_unit_factory("kg / m")
-    )
-
 
 class FireSprinklersV1(BaseOpenEpdHierarchicalSpec):
     """Fire sprinklers performance specification."""
@@ -118,18 +110,10 @@ class PipingV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="6 mm")
     piping_diameter: LengthMmStr | None = pyd.Field(default=None, description="", example="120 mm")
-    mass_per_unit_length: str | None = pyd.Field(default=None, description="", example="1 kg / m")
+    mass_per_unit_length: MassPerLengthStr | None = pyd.Field(default=None, description="", example="1 kg / m")
     piping_ansi_schedule: PipingAnsiSchedule | None = pyd.Field(default=None, description="", example="5")
     plumbing_piping_material: PlumbingPipingMaterial | None = pyd.Field(default=None, description="", example="PVC")
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
-    _piping_diameter_is_quantity_validator = pyd.validator("piping_diameter", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-    _mass_per_unit_length_is_quantity_validator = pyd.validator("mass_per_unit_length", allow_reuse=True)(
-        validate_unit_factory("kg / m")
-    )
-
 
 class PlumbingEquipmentV1(BaseOpenEpdHierarchicalSpec):
     """Plumbing equipment performance specification."""

openepd/model/specs/generated/precast_concrete.py

@@ -20,7 +20,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import PressureMPaStr, validate_unit_factory
+from openepd.model.validation.quantity import PressureMPaStr
 
 
 class ArchitecturalPrecastV1(BaseOpenEpdHierarchicalSpec):
@@ -58,10 +58,6 @@ class PrecastConcreteV1(BaseOpenEpdHierarchicalSpec):
     )
     steel_mass_percentage: RatioFloat | None = pyd.Field(default=None, description="", example=0.5, ge=0, le=1)
 
-    _concrete_compressive_strength_28d_is_quantity_validator = pyd.validator(
-        "concrete_compressive_strength_28d", allow_reuse=True
-    )(validate_unit_factory("MPa"))
-
     # Nested specs:
     ArchitecturalPrecast: ArchitecturalPrecastV1 | None = None
     StructuralPrecast: StructuralPrecastV1 | None = None

openepd/model/specs/generated/steel.py

@@ -18,14 +18,22 @@
 #  Find out more at www.BuildingTransparency.org
 #
 from openepd.compat.pydantic import pyd
+from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec
 from openepd.model.specs.generated.enums import SteelComposition, SteelRebarGrade
-from openepd.model.specs.steel import SteelMakingRoute
 from openepd.model.standard import Standard
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_unit_factory
 
 
+class SteelMakingRoute(BaseOpenEpdSchema):
+    """Steel making route."""
+
+    bof: bool | None = pyd.Field(default=None, description="Basic oxygen furnace")
+    eaf: bool | None = pyd.Field(default=None, description="Electric arc furnace")
+    ohf: bool | None = pyd.Field(default=None, description="Open hearth furnace")
+
+
 class SteelFabricatedMixin(BaseOpenEpdSpec):
     """Class with fabricated property used in different parts of steel hierarchy."""
 
@@ -180,9 +188,6 @@ class StructuralSteelV1(BaseOpenEpdHierarchicalSpec):
         example="1.45E-5 W / (m * K)",
     )
 
-    _steel_modulus_of_elasticity_is_quantity_validator = pyd.validator("modulus_of_elasticity", allow_reuse=True)(
-        validate_unit_factory("MPa")
-    )
     _steel_thermal_expansion_is_quantity_validator = pyd.validator("thermal_expansion", allow_reuse=True)(
         validate_unit_factory("1 / K")
     )
@@ -228,10 +233,6 @@ class RebarSteelV1(BaseOpenEpdHierarchicalSpec, SteelFabricatedMixin):
     )
     epoxy_coated: bool | None = pyd.Field(default=None, example=True)
 
-    _steel_rebar_diameter_min_is_quantity_validator = pyd.validator("diameter_min", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-
 
 class WireMeshSteelV1(BaseOpenEpdHierarchicalSpec, SteelFabricatedMixin):
     """Mild steel wire for reinforcement, connections, and meshes."""
@@ -263,7 +264,7 @@ class SteelV1(BaseOpenEpdHierarchicalSpec):
         default=None, description="The marking to be expected on the product.", example="S4S60"
     )
     euro_marking: str | None = pyd.Field(
-        default=None, description="The marking to be expected on the product.", examples="S4S60"
+        default=None, description="The marking to be expected on the product.", example="S4S60"
     )
     composition: SteelComposition | None = pyd.Field(
         default=None, description="Basic chemical composition", example="Carbon"
@@ -276,10 +277,6 @@ class SteelV1(BaseOpenEpdHierarchicalSpec):
     sae_standards: list[Standard] | None = pyd.Field(default=None, description="List of SAE standards")
     en_standards: list[Standard] | None = pyd.Field(default=None, description="List of EN standards")
 
-    _steel_yield_tensile_str_is_quantity_validator = pyd.validator("yield_tensile_str", allow_reuse=True)(
-        validate_unit_factory("MPa")
-    )
-
     # Nested specs:
     MBQSteel: MBQSteelV1 | None = None
     CoilSteel: CoilSteelV1 | None = None

openepd/model/specs/generated/thermal_moisture_protection.py

@@ -28,7 +28,7 @@ from openepd.model.specs.generated.enums import (
     RoofCoverBoardsMaterial,
 )
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr
 
 
 class BituminousRoofingV1(BaseOpenEpdHierarchicalSpec):
@@ -93,10 +93,6 @@ class BoardInsulationV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     compressive_strength: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
 
-    _compressive_strength_is_quantity_validator = pyd.validator("compressive_strength", allow_reuse=True)(
-        validate_unit_factory("MPa")
-    )
-
 
 class FoamedInPlaceV1(BaseOpenEpdHierarchicalSpec):
     """Foamed in place performance specification."""
@@ -134,8 +130,6 @@ class MembraneRoofingV1(BaseOpenEpdHierarchicalSpec):
     nsf347: bool | None = pyd.Field(default=None, description="", example=True)
     vantage_vinyl: bool | None = pyd.Field(default=None, description="", example=True)
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
-
     # Nested specs:
     BituminousRoofing: BituminousRoofingV1 | None = None
     SinglePlyEPDM: SinglePlyEPDMV1 | None = None
@@ -159,10 +153,6 @@ class InsulationV1(BaseOpenEpdHierarchicalSpec):
     )
     thickness_per_declared_unit: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
 
-    _thickness_per_declared_unit_is_quantity_validator = pyd.validator("thickness_per_declared_unit", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-
     # Nested specs:
     BlanketInsulation: BlanketInsulationV1 | None = None
     BlownInsulation: BlownInsulationV1 | None = None
@@ -199,10 +189,6 @@ class RoofCoverBoardsV1(BaseOpenEpdHierarchicalSpec):
     facing: list[RoofCoverBoardsFacing] | None = pyd.Field(default=None, description="", example=["Paper"])
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
 
-    _roof_cover_boards_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-
 
 class SteepSlopeRoofingV1(BaseOpenEpdHierarchicalSpec):
     """Steep slope roofing performance specification."""

openepd/model/specs/generated/utility_piping.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 BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
-from openepd.model.validation.quantity import LengthMmStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, MassPerLengthStr
 
 
 class BuildingHeatingPipingV1(BaseOpenEpdHierarchicalSpec):
@@ -48,18 +48,10 @@ class UtilityPipingV1(BaseOpenEpdHierarchicalSpec):
     # Own fields:
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="6 m")
     piping_diameter: LengthMmStr | None = pyd.Field(default=None, description="", example="200 mm")
-    mass_per_unit_length: str | None = pyd.Field(default=None, description="", example="1 kg / m")
+    mass_per_unit_length: MassPerLengthStr | None = pyd.Field(default=None, description="", example="1 kg / m")
     piping_ansi_schedule: PipingAnsiSchedule | None = pyd.Field(default=None, description="", example="5")
     utility_piping_material: UtilityPipingMaterial | None = pyd.Field(default=None, description="", example="PVC")
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
-    _piping_diameter_is_quantity_validator = pyd.validator("piping_diameter", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-    _mass_per_unit_length_is_quantity_validator = pyd.validator("mass_per_unit_length", allow_reuse=True)(
-        validate_unit_factory("kg / m")
-    )
-
     # Nested specs:
     BuildingHeatingPiping: BuildingHeatingPipingV1 | None = None
     BuriedPiping: BuriedPipingV1 | None = None

openepd/model/specs/generated/wood.py

@@ -31,7 +31,7 @@ from openepd.model.specs.generated.enums import (
     SheathingPanelsFabrication,
 )
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr
 
 
 class WoodDeckingV1(BaseOpenEpdHierarchicalSpec):
@@ -119,10 +119,6 @@ class SheathingPanelsV1(BaseOpenEpdHierarchicalSpec):
     wood_board_thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
     timber_species: EngineeredTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
 
-    _wood_board_thickness_is_quantity_validator = pyd.validator("wood_board_thickness", allow_reuse=True)(
-        validate_unit_factory("m")
-    )
-
 
 class UnfinishedWoodV1(BaseOpenEpdHierarchicalSpec):
     """Unfinished or 'green' timber."""