openepd 6.13.2__py3-none-any.whl → 7.0.0__py3-none-any.whl

openepd/model/specs/range/precast_concrete.py

@@ -21,10 +21,8 @@ __all__ = (
     "PrecastConcreteRangeV1",
 )
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.singular.precast_concrete import (
@@ -35,6 +33,8 @@ from openepd.model.specs.singular.precast_concrete import (
 )
 from openepd.model.validation.quantity import AmountRangePressureMpa
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class ArchitecturalPrecastRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -45,8 +45,9 @@ class ArchitecturalPrecastRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    element_type: ArchitecturalPrecastElementType | None = pyd.Field(
-        default=None, description="Precast element type used for architectural applications."
+    element_type: ArchitecturalPrecastElementType | None = pydantic.Field(
+        default=None,
+        description="Precast element type used for architectural applications.",
     )
 
 
@@ -59,8 +60,9 @@ class StructuralPrecastRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    element_type: StructuralPrecastElementType | None = pyd.Field(
-        default=None, description="Precast element type used for structural applications."
+    element_type: StructuralPrecastElementType | None = pydantic.Field(
+        default=None,
+        description="Precast element type used for structural applications.",
     )
 
 
@@ -73,8 +75,9 @@ class UtilityUndergroundPrecastRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    element_type: UtilityPrecastElementType | None = pyd.Field(
-        default=None, description="Precast element type used for utility underground applications."
+    element_type: UtilityPrecastElementType | None = pydantic.Field(
+        default=None,
+        description="Precast element type used for utility underground applications.",
     )
 
 
@@ -87,8 +90,9 @@ class CivilPrecastRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    element_type: CivilPrecastElementType | None = pyd.Field(
-        default=None, description="Precast element type used as civil engineering components."
+    element_type: CivilPrecastElementType | None = pydantic.Field(
+        default=None,
+        description="Precast element type used as civil engineering components.",
     )
 
 
@@ -101,14 +105,14 @@ class PrecastConcreteRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    lightweight: bool | None = pyd.Field(default=None, description="")
-    concrete_compressive_strength_28d: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    insulated: bool | None = pyd.Field(default=None, description="")
-    gfrc: bool | None = pyd.Field(
+    lightweight: bool | None = pydantic.Field(default=None, description="")
+    concrete_compressive_strength_28d: AmountRangePressureMpa | None = pydantic.Field(default=None, description="")
+    insulated: bool | None = pydantic.Field(default=None, description="")
+    gfrc: bool | None = pydantic.Field(
         default=None,
         description="Glass Fiber Reinforced Concrete is fiber-reinforced concrete sometimes used in architectural panels",
     )
-    steel_mass_percentage: RangeRatioFloat | None = pyd.Field(default=None, description="")
+    steel_mass_percentage: RangeRatioFloat | None = pydantic.Field(default=None, description="")
     ArchitecturalPrecast: ArchitecturalPrecastRangeV1 | None = None
     StructuralPrecast: StructuralPrecastRangeV1 | None = None
     UtilityUndergroundPrecast: UtilityUndergroundPrecastRangeV1 | None = None

openepd/model/specs/range/sheathing.py

@@ -19,15 +19,15 @@ __all__ = (
     "SheathingRangeV1",
 )
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-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, AmountRangeRFactor
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class CementitiousSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -41,7 +41,7 @@ class CementitiousSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    cement_board_thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    cement_board_thickness: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
 
 
 class GypsumSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -55,20 +55,20 @@ class GypsumSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    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: 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="")
-    indentation_d5420: RangeInt | None = pyd.Field(default=None, description="")
-    soft_body_impact_e695: RangeInt | None = pyd.Field(default=None, description="")
-    hard_body_impact_c1929: RangeInt | None = pyd.Field(default=None, description="")
-    mold_resistant: bool | None = pyd.Field(default=None, description="")
-    foil_backing: bool | None = pyd.Field(default=None, description="")
-    moisture_resistant: bool | None = pyd.Field(default=None, description="")
-    abuse_resistant: bool | None = pyd.Field(default=None, description="")
+    fire_rating: list[GypsumFireRating] | None = pydantic.Field(default=None, description="")
+    thickness: list[GypsumThickness] | None = pydantic.Field(default=None, description="")
+    facing: list[GypsumFacing] | None = pydantic.Field(default=None, description="")
+    r_factor: AmountRangeRFactor | None = pydantic.Field(default=None, description="")
+    flame_spread_astm_e84: RangeInt | None = pydantic.Field(default=None, description="")
+    smoke_production_astm_e84: RangeInt | None = pydantic.Field(default=None, description="")
+    surface_abrasion_d4977: RangeInt | None = pydantic.Field(default=None, description="")
+    indentation_d5420: RangeInt | None = pydantic.Field(default=None, description="")
+    soft_body_impact_e695: RangeInt | None = pydantic.Field(default=None, description="")
+    hard_body_impact_c1929: RangeInt | None = pydantic.Field(default=None, description="")
+    mold_resistant: bool | None = pydantic.Field(default=None, description="")
+    foil_backing: bool | None = pydantic.Field(default=None, description="")
+    moisture_resistant: bool | None = pydantic.Field(default=None, description="")
+    abuse_resistant: bool | None = pydantic.Field(default=None, description="")
 
 
 class SheathingRangeV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/range/steel.py

@@ -35,10 +35,8 @@ __all__ = (
     "SteelRangeV1",
 )
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import SteelComposition, SteelRebarGrade
@@ -51,6 +49,8 @@ from openepd.model.validation.quantity import (
     AmountRangeThermalExpansion,
 )
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class ColdFormedFramingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -226,15 +226,15 @@ class StructuralSteelRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    modulus_of_elasticity: AmountRangePressureMpa | None = pyd.Field(
+    modulus_of_elasticity: AmountRangePressureMpa | None = pydantic.Field(
         default=None,
         description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus ",
     )
-    thermal_expansion: AmountRangeThermalExpansion | None = pyd.Field(
+    thermal_expansion: AmountRangeThermalExpansion | None = pydantic.Field(
         default=None,
         description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion",
     )
-    thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(
+    thermal_conductivity: AmountRangeThermalConductivity | None = pydantic.Field(
         default=None,
         description="Thermal Conductivity, https://en.wikipedia.org/wiki/Thermal_conductivity_and_resistivity",
     )
@@ -278,14 +278,14 @@ class RebarSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     fabricated: bool | None = None
-    grade: list[SteelRebarGrade] | None = pyd.Field(default=None)
-    diameter_min: AmountRangeLengthMm | None = pyd.Field(default=None, description="Minimal diameter")
-    bending_pin_max: RangeFloat | None = pyd.Field(default=None)
-    ts_ys_ratio_max: RangeFloat | None = pyd.Field(
+    grade: list[SteelRebarGrade] | None = pydantic.Field(default=None)
+    diameter_min: AmountRangeLengthMm | None = pydantic.Field(default=None, description="Minimal diameter")
+    bending_pin_max: RangeFloat | None = pydantic.Field(default=None)
+    ts_ys_ratio_max: RangeFloat | None = pydantic.Field(
         default=None,
         description="Max ratio of ultimate tensile to yield tensile strength",
     )
-    epoxy_coated: bool | None = pyd.Field(default=None)
+    epoxy_coated: bool | None = pydantic.Field(default=None)
 
 
 class WireMeshSteelRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -315,29 +315,29 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    yield_tensile_str: AmountRangePressureMpa | None = pyd.Field(
+    yield_tensile_str: AmountRangePressureMpa | None = pydantic.Field(
         default=None,
         description="Yield Tensile strength (Mpa) per unit area. Yield strength is the point at which a material begins to permanently deform or change shape due to applied stress.",
     )
-    bar_elongation: RangeFloat | None = pyd.Field(
+    bar_elongation: RangeFloat | None = pydantic.Field(
         default=None,
         description="Increase in length at break, in percent. Typically 10%-20%",
     )
-    recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="")
-    post_consumer_recycled_content: RangeRatioFloat | None = pyd.Field(
+    recycled_content: RangeRatioFloat | None = pydantic.Field(default=None, description="")
+    post_consumer_recycled_content: RangeRatioFloat | None = pydantic.Field(
         default=None,
         description="Should be a number between zero and the Recycled Content (steel_recycled_content)",
     )
-    astm_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
-    euro_marking: str | None = pyd.Field(default=None, description="The marking to be expected on the product.")
-    composition: list[SteelComposition] | None = pyd.Field(default=None, description="Basic chemical composition")
-    cold_finished: bool | None = pyd.Field(default=None)
-    galvanized: bool | None = pyd.Field(default=None)
-    stainless: bool | None = pyd.Field(default=None)
-    making_route: SteelMakingRoute | None = pyd.Field(default=None)
-    astm_standards: list[Standard] | None = pyd.Field(default=None, description="List of ASTM standards")
-    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")
+    astm_marking: str | None = pydantic.Field(default=None, description="The marking to be expected on the product.")
+    euro_marking: str | None = pydantic.Field(default=None, description="The marking to be expected on the product.")
+    composition: list[SteelComposition] | None = pydantic.Field(default=None, description="Basic chemical composition")
+    cold_finished: bool | None = pydantic.Field(default=None)
+    galvanized: bool | None = pydantic.Field(default=None)
+    stainless: bool | None = pydantic.Field(default=None)
+    making_route: SteelMakingRoute | None = pydantic.Field(default=None)
+    astm_standards: list[Standard] | None = pydantic.Field(default=None, description="List of ASTM standards")
+    sae_standards: list[Standard] | None = pydantic.Field(default=None, description="List of SAE standards")
+    en_standards: list[Standard] | None = pydantic.Field(default=None, description="List of EN standards")
     MBQSteel: MBQSteelRangeV1 | None = None
     CoilSteel: CoilSteelRangeV1 | None = None
     ColdFormedSteel: ColdFormedSteelRangeV1 | None = None

openepd/model/specs/range/thermal_moisture_protection.py

@@ -38,10 +38,8 @@ __all__ = (
     "ThermalMoistureProtectionRangeV1",
 )
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
@@ -54,6 +52,8 @@ from openepd.model.specs.enums import (
 )
 from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class BituminousRoofingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -158,7 +158,7 @@ class BoardInsulationRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    compressive_strength: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
+    compressive_strength: AmountRangePressureMpa | None = pydantic.Field(default=None, description="")
 
 
 class FoamedInPlaceRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -170,7 +170,7 @@ class FoamedInPlaceRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    foam_type: list[FoamType] | None = pyd.Field(default=None, description="")
+    foam_type: list[FoamType] | None = pydantic.Field(default=None, description="")
 
 
 class SprayedInsulationRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -207,14 +207,14 @@ class MembraneRoofingRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    sri: RangeFloat | None = pyd.Field(default=None, description="")
-    total_recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="")
-    post_consumer_recycled_content: RangeRatioFloat | None = pyd.Field(default=None, description="")
-    reinforcement: list[MembraneRoofingReinforcement] | None = pyd.Field(default=None, description="")
-    felt_backing: bool | None = pyd.Field(default=None, description="")
-    nsf347: bool | None = pyd.Field(default=None, description="")
-    vantage_vinyl: bool | None = pyd.Field(default=None, description="")
+    thickness: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
+    sri: RangeFloat | None = pydantic.Field(default=None, description="")
+    total_recycled_content: RangeRatioFloat | None = pydantic.Field(default=None, description="")
+    post_consumer_recycled_content: RangeRatioFloat | None = pydantic.Field(default=None, description="")
+    reinforcement: list[MembraneRoofingReinforcement] | None = pydantic.Field(default=None, description="")
+    felt_backing: bool | None = pydantic.Field(default=None, description="")
+    nsf347: bool | None = pydantic.Field(default=None, description="")
+    vantage_vinyl: bool | None = pydantic.Field(default=None, description="")
     BituminousRoofing: BituminousRoofingRangeV1 | None = None
     SinglePlyEPDM: SinglePlyEPDMRangeV1 | None = None
     SinglePlyKEE: SinglePlyKEERangeV1 | None = None
@@ -233,10 +233,10 @@ class InsulationRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    r_value: RangeFloat | None = pyd.Field(default=None, description="")
-    material: list[InsulatingMaterial] | None = pyd.Field(default=None, description="")
-    intended_application: list[InsulationIntendedApplication] | None = pyd.Field(default=None, description="")
-    thickness_per_declared_unit: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    r_value: RangeFloat | None = pydantic.Field(default=None, description="")
+    material: list[InsulatingMaterial] | None = pydantic.Field(default=None, description="")
+    intended_application: list[InsulationIntendedApplication] | None = pydantic.Field(default=None, description="")
+    thickness_per_declared_unit: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
     BlanketInsulation: BlanketInsulationRangeV1 | None = None
     BlownInsulation: BlownInsulationRangeV1 | None = None
     BoardInsulation: BoardInsulationRangeV1 | None = None
@@ -288,9 +288,9 @@ class RoofCoverBoardsRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    material: list[RoofCoverBoardsMaterial] | None = pyd.Field(default=None, description="")
-    facing: list[RoofCoverBoardsFacing] | None = pyd.Field(default=None, description="")
-    thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
+    material: list[RoofCoverBoardsMaterial] | None = pydantic.Field(default=None, description="")
+    facing: list[RoofCoverBoardsFacing] | None = pydantic.Field(default=None, description="")
+    thickness: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
 
 
 class SteepSlopeRoofingRangeV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/range/utility_piping.py

@@ -19,15 +19,15 @@ __all__ = (
     "UtilityPipingRangeV1",
 )
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeAmount
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class BuildingHeatingPipingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -51,7 +51,7 @@ class BuriedPipingRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    buried_piping_type: list[BuriedPipingType] | None = pyd.Field(default=None, description="")
+    buried_piping_type: list[BuriedPipingType] | None = pydantic.Field(default=None, description="")
 
 
 class UtilityPipingRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -66,10 +66,10 @@ class UtilityPipingRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    piping_diameter: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    mass_per_unit_length: RangeAmount | None = pyd.Field(default=None, description="")
-    piping_ansi_schedule: list[PipingAnsiSchedule] | None = pyd.Field(default=None, description="")
-    utility_piping_material: list[UtilityPipingMaterial] | None = pyd.Field(default=None, description="")
+    thickness: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
+    piping_diameter: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
+    mass_per_unit_length: RangeAmount | None = pydantic.Field(default=None, description="")
+    piping_ansi_schedule: list[PipingAnsiSchedule] | None = pydantic.Field(default=None, description="")
+    utility_piping_material: list[UtilityPipingMaterial] | None = pydantic.Field(default=None, description="")
     BuildingHeatingPiping: BuildingHeatingPipingRangeV1 | None = None
     BuriedPiping: BuriedPipingRangeV1 | None = None

openepd/model/specs/range/wood.py

@@ -34,7 +34,8 @@ __all__ = (
 
 from builtins import float
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
@@ -46,7 +47,6 @@ from openepd.model.specs.enums import (
     SawnTimberSpecies,
     SheathingPanelsFabrication,
 )
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 
@@ -105,8 +105,8 @@ class CompositeLumberRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    fabrication: list[CompositeLumberFabrication] | None = pyd.Field(default=None, description="")
-    timber_species: list[EngineeredTimberSpecies] | None = pyd.Field(default=None, description="")
+    fabrication: list[CompositeLumberFabrication] | None = pydantic.Field(default=None, description="")
+    timber_species: list[EngineeredTimberSpecies] | None = pydantic.Field(default=None, description="")
 
 
 class DimensionLumberRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -118,7 +118,7 @@ class DimensionLumberRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    timber_species: list[SawnTimberSpecies] | None = pyd.Field(default=None, description="")
+    timber_species: list[SawnTimberSpecies] | None = pydantic.Field(default=None, description="")
     WoodDecking: WoodDeckingRangeV1 | None = None
     WoodFraming: WoodFramingRangeV1 | None = None
 
@@ -145,8 +145,8 @@ class MassTimberRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    fabrication: list[MassTimberFabrication] | None = pyd.Field(default=None, description="")
-    timber_species: list[EngineeredTimberSpecies] | None = pyd.Field(default=None, description="")
+    fabrication: list[MassTimberFabrication] | None = pydantic.Field(default=None, description="")
+    timber_species: list[EngineeredTimberSpecies] | None = pydantic.Field(default=None, description="")
 
 
 class NonStructuralWoodRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -184,9 +184,9 @@ class SheathingPanelsRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    fabrication: list[SheathingPanelsFabrication] | None = pyd.Field(default=None, description="")
-    wood_board_thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
-    timber_species: list[EngineeredTimberSpecies] | None = pyd.Field(default=None, description="")
+    fabrication: list[SheathingPanelsFabrication] | None = pydantic.Field(default=None, description="")
+    wood_board_thickness: AmountRangeLengthMm | None = pydantic.Field(default=None, description="")
+    timber_species: list[EngineeredTimberSpecies] | None = pydantic.Field(default=None, description="")
 
 
 class UnfinishedWoodRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -209,17 +209,17 @@ class WoodRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     forest_practices_certifiers: list[OrgRef] | None = None
-    timber_species: list[AllTimberSpecies] | None = pyd.Field(default=None, description="Timber species")
-    fabrication: list[AllFabrication] | None = pyd.Field(default=None, description="Timber fabrication")
-    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: RatioFloat | None = pyd.Field(
+    timber_species: list[AllTimberSpecies] | None = pydantic.Field(default=None, description="Timber species")
+    fabrication: list[AllFabrication] | None = pydantic.Field(default=None, description="Timber fabrication")
+    weather_exposed: bool | None = pydantic.Field(default=None, description="Weather exposed")
+    fire_retardant: bool | None = pydantic.Field(default=None, description="Fire retardant")
+    decay_resistant: bool | None = pydantic.Field(default=None, description="Decay resistant")
+    fsc_certified: float | None = pydantic.Field(
         default=None, description="Forest Stewardship Council certified proportion"
     )
-    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="")
+    fsc_certified_z: float | None = pydantic.Field(default=None, description="")
+    recycled_content: float | None = pydantic.Field(default=None, description="Recycled content")
+    recycled_content_z: float | None = pydantic.Field(default=None, description="")
     CompositeLumber: CompositeLumberRangeV1 | None = None
     DimensionLumber: DimensionLumberRangeV1 | None = None
     HeavyTimber: HeavyTimberRangeV1 | None = None

openepd/model/specs/range/wood_joists.py

@@ -15,14 +15,14 @@
 #
 __all__ = ("WoodJoistsRangeV1",)
 
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import AllFabrication, AllTimberSpecies
 
+# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
+
 
 class WoodJoistsRangeV1(BaseOpenEpdHierarchicalSpec):
     """
@@ -37,8 +37,8 @@ class WoodJoistsRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     forest_practices_certifiers: list[OrgRef] | None = None
-    timber_species: list[AllTimberSpecies] | None = pyd.Field(default=None, description="")
-    fabrication: list[AllFabrication] | None = pyd.Field(default=None, description="")
-    weather_exposed: bool | None = pyd.Field(default=None, description="")
-    fire_retardant: bool | None = pyd.Field(default=None, description="")
-    decay_resistant: bool | None = pyd.Field(default=None, description="")
+    timber_species: list[AllTimberSpecies] | None = pydantic.Field(default=None, description="")
+    fabrication: list[AllFabrication] | None = pydantic.Field(default=None, description="")
+    weather_exposed: bool | None = pydantic.Field(default=None, description="")
+    fire_retardant: bool | None = pydantic.Field(default=None, description="")
+    decay_resistant: bool | None = pydantic.Field(default=None, description="")

openepd/model/specs/singular/__init__.py

@@ -15,7 +15,8 @@
 #
 from typing import Any, ClassVar
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.singular.accessories import AccessoriesV1
 from openepd.model.specs.singular.aggregates import AggregatesV1
@@ -57,13 +58,16 @@ 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",)
+__all__ = ("Specs", "BaseCompatibilitySpec")
 
 
 class Specs(BaseOpenEpdHierarchicalSpec):
     """Material specific specs."""
 
-    COMPATIBILITY_SPECS: ClassVar[list[type[BaseCompatibilitySpec]]] = [ConcreteOldSpec, SteelOldSpec]
+    COMPATIBILITY_SPECS: ClassVar[list[type[BaseCompatibilitySpec]]] = [
+        ConcreteOldSpec,
+        SteelOldSpec,
+    ]
 
     _EXT_VERSION = "1.0"
 
@@ -107,8 +111,8 @@ class Specs(BaseOpenEpdHierarchicalSpec):
     concrete: ConcreteOldSpec | None = None
     steel: SteelOldSpec | None = None
 
-    @pyd.root_validator(pre=True)
-    def _ensure_backward_compatibiltiy(cls, values: dict[str, Any]) -> dict[str, Any]:
+    @pydantic.model_validator(mode="before")
+    def _ensure_backward_compatibility(cls, values: dict[str, Any]) -> dict[str, Any]:
         """
         Restore the functionality for backward-compatible specs.
 

openepd/model/specs/singular/aggregates.py

@@ -13,22 +13,25 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import AggregateGradation, AggregateWeightClassification
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr
 
 
 class AggregateApplication(BaseOpenEpdSchema):
     """Application for aggregates."""
 
-    concrete: bool | None = pyd.Field(default=None, description="Aggregates used in concrete and masonry applications")
-    asphalt: bool | None = pyd.Field(
-        default=None, description="Aggregates used in bituminous paving and surface applications"
+    concrete: bool | None = pydantic.Field(
+        default=None, description="Aggregates used in concrete and masonry applications"
+    )
+    asphalt: bool | None = pydantic.Field(
+        default=None,
+        description="Aggregates used in bituminous paving and surface applications",
     )
-    unbound: bool | None = pyd.Field(default=None)
+    unbound: bool | None = pydantic.Field(default=None)
 
 
 class AggregatesV1(BaseOpenEpdHierarchicalSpec):
@@ -41,26 +44,30 @@ class AggregatesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    recycled_content: RatioFloat | None = pyd.Field(
-        example=0.3, default=None, description="Percent of total mass that is recycled aggregate"
+    recycled_content: float | None = pydantic.Field(
+        examples=[0.3],
+        default=None,
+        description="Percent of total mass that is recycled aggregate",
+        ge=0,
+        le=1,
     )
-    nominal_max_size: LengthMmStr | None = pyd.Field(
+    nominal_max_size: LengthMmStr | None = pydantic.Field(
         default=None,
-        example="10 mm",
+        examples=["10 mm"],
         description="Nominal maximum aggregate size is defined as one sieve size smaller than the maximum "
         "aggregate size. "
         "The maximum aggregate size is defined as the smallest sieve size that requires 100% passing.",
     )
-    weight_classification: AggregateWeightClassification | None = pyd.Field(
-        example=str(AggregateWeightClassification.HEAVY_WEIGHT), default=None
+    weight_classification: AggregateWeightClassification | None = pydantic.Field(
+        examples=[str(AggregateWeightClassification.HEAVY_WEIGHT)], default=None
     )
-    gradation: AggregateGradation | None = pyd.Field(example=str(AggregateGradation.GAP), default=None)
-    manufactured: bool | None = pyd.Field(
+    gradation: AggregateGradation | None = pydantic.Field(examples=[str(AggregateGradation.GAP)], default=None)
+    manufactured: bool | None = pydantic.Field(
         default=None,
         description="Aggregate produced via expansion or sintering at high temperatures of the following materials: "
         "clay, shale, slate, perlite, vermiculite, or slag. Typically used to produce lightweight aggregate",
     )
-    slag: bool | None = pyd.Field(
+    slag: bool | None = pydantic.Field(
         default=None,
         description="Pelletized, foamed, and granulated blast furnace slag can be used as construction aggregate.",
     )