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

openepd/model/specs/singular/aluminium.py

@@ -13,7 +13,8 @@
 #  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.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import AluminiumAlloy
 
@@ -33,7 +34,11 @@ class AluminiumExtrusionsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thermally_improved: bool | None = pyd.Field(default=None, description="", example=True)
+    thermally_improved: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
 
 class AluminiumSheetGoodsV1(BaseOpenEpdHierarchicalSpec):
@@ -54,9 +59,19 @@ class AluminiumV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    alloy: AluminiumAlloy | None = pyd.Field(default=None, description="", example=str(AluminiumAlloy.ALLOY_1XXX))
-    anodized: bool | None = pyd.Field(default=None, description="", example=True)
-    painted: bool | None = pyd.Field(default=None, description="", example=True)
+    alloy: AluminiumAlloy | None = pydantic.Field(
+        default=None, description="", examples=[str(AluminiumAlloy.ALLOY_1XXX)]
+    )
+    anodized: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    painted: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
     # Nested specs:
     AluminiumBillets: AluminiumBilletsV1 | None = None

openepd/model/specs/singular/asphalt.py

@@ -15,10 +15,10 @@
 #
 from typing import Annotated
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 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
 
 
@@ -28,47 +28,71 @@ class AsphaltV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    aggregate_size_max: LengthMmStr | None = pyd.Field(default=None, description="Max aggregate size", example="20 mm")
-    rap: RatioFloat | None = pyd.Field(
+    aggregate_size_max: LengthMmStr | None = pydantic.Field(
+        default=None, description="Max aggregate size", examples=["20 mm"]
+    )
+    rap: float | None = pydantic.Field(
         default=None,
         description="Percent of mixture that has been replaced by recycled asphalt pavement (RAP).",
-        example=0.5,
+        examples=[0.5],
         ge=0,
         le=1,
     )
-    ras: RatioFloat | None = pyd.Field(
+    ras: float | None = pydantic.Field(
         default=None,
         description="Percent of mixture that has been replaced by recycled asphalt shingles (RAS).",
-        example=0.5,
+        examples=[0.5],
         ge=0,
         le=1,
     )
-    ground_tire_rubber: RatioFloat | None = pyd.Field(
+    ground_tire_rubber: float | None = pydantic.Field(
         default=None,
         description="Percent of mixture that has been replaced by ground tire rubber (GTR).",
-        example=0.5,
+        examples=[0.5],
         ge=0,
         le=1,
     )
-    max_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pyd.Field(
+    max_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pydantic.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",
+        examples=["90 °C"],
     )
-    min_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pyd.Field(
+    min_temperature: Annotated[TemperatureCStr | None, CodegenSpec(override_type=TemperatureCStr)] = pydantic.Field(
         default=None,
         description="The lower threshold temperature for an asphalt "
         "binder to prevent thermal cracking of the asphalt"
         " mixture.",
-        example="-20 °C",
+        examples=["-20 °C"],
+    )
+    mix_type: AsphaltMixType | None = pydantic.Field(default=None, description="Asphalt mix type", examples=["WMA"])
+    gradation: AsphaltGradation | None = pydantic.Field(
+        default=None, description="Asphalt gradation", examples=["Gap-graded"]
     )
-    mix_type: AsphaltMixType | None = pyd.Field(default=None, description="Asphalt mix type", example="WMA")
-    gradation: AsphaltGradation | None = pyd.Field(default=None, description="Asphalt gradation", example="Gap-graded")
 
-    sbr: bool | None = pyd.Field(default=None, description="Styrene-butadiene rubber (SBR)", example=True)
-    sbs: bool | None = pyd.Field(default=None, description="Styrene-butadiene-styrene (SBS)", example=True)
-    ppa: bool | None = pyd.Field(default=None, description="Polyphosphoric acid (PPA)", example=True)
-    gtr: bool | None = pyd.Field(default=None, description="Ground tire rubber (GTR)", example=True)
-    pmb: bool | None = pyd.Field(default=None, description="Polymer modified bitumen (PMB)", example=True)
+    sbr: bool | None = pydantic.Field(
+        default=None,
+        description="Styrene-butadiene rubber (SBR)",
+        examples=[True],
+    )
+    sbs: bool | None = pydantic.Field(
+        default=None,
+        description="Styrene-butadiene-styrene (SBS)",
+        examples=[True],
+    )
+    ppa: bool | None = pydantic.Field(
+        default=None,
+        description="Polyphosphoric acid (PPA)",
+        examples=[True],
+    )
+    gtr: bool | None = pydantic.Field(
+        default=None,
+        description="Ground tire rubber (GTR)",
+        examples=[True],
+    )
+    pmb: bool | None = pydantic.Field(
+        default=None,
+        description="Polymer modified bitumen (PMB)",
+        examples=[True],
+    )

openepd/model/specs/singular/cladding.py

@@ -13,7 +13,8 @@
 #  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.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CladdingFacingMaterial, CladdingInsulatingMaterial, SidingFormFactor
 from openepd.model.validation.quantity import LengthMmStr, LengthMStr, RValueStr, validate_quantity_unit_factory
@@ -72,11 +73,11 @@ class InsulatedVinylSidingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 mm")
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["1 mm"])
 
-    _vinyl_siding_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_quantity_unit_factory("m")
-    )
+    @pydantic.field_validator("thickness", mode="before")
+    def _vinyl_siding_thickness_is_quantity_validator(cls, value):
+        return validate_quantity_unit_factory("m")(cls, value)
 
 
 class PlywoodSidingV1(BaseOpenEpdHierarchicalSpec):
@@ -106,11 +107,11 @@ class VinylSidingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="5 mm")
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["5 mm"])
 
-    _vinyl_siding_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_quantity_unit_factory("m")
-    )
+    @pydantic.field_validator("thickness")
+    def _vinyl_siding_thickness_is_quantity_validator(cls, value):
+        return validate_quantity_unit_factory("m")(cls, value)
 
 
 class SidingV1(BaseOpenEpdHierarchicalSpec):
@@ -123,11 +124,23 @@ class SidingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    insulated: bool | None = pyd.Field(default=None, description="", example=True)
-    ventilated: bool | None = pyd.Field(default=None, description="", example=True)
-    paint_or_stain_required: bool | None = pyd.Field(default=None, description="", example=True)
-    r_value: RValueStr | None = pyd.Field(default=None, description="")
-    form_factor: SidingFormFactor | None = pyd.Field(default=None, description="", example="Lap")
+    insulated: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    ventilated: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    paint_or_stain_required: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    r_value: RValueStr | None = pydantic.Field(default=None, description="")
+    form_factor: SidingFormFactor | None = pydantic.Field(default=None, description="", examples=["Lap"])
 
     # Nested specs:
     MetalSiding: MetalSidingV1 | None = None
@@ -146,9 +159,9 @@ class InsulatedRoofPanelsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    r_value: RValueStr | None = pyd.Field(default=None, description="")
-    insulating_material: CladdingInsulatingMaterial | None = pyd.Field(
-        default=None, description="", example="No Insulation"
+    r_value: RValueStr | None = pydantic.Field(default=None, description="")
+    insulating_material: CladdingInsulatingMaterial | None = pydantic.Field(
+        default=None, description="", examples=["No Insulation"]
     )
 
 
@@ -158,9 +171,9 @@ class InsulatedWallPanelsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    r_value: RValueStr | None = pyd.Field(default=None, description="")
-    insulating_material: CladdingInsulatingMaterial | None = pyd.Field(
-        default=None, description="", example="No Insulation"
+    r_value: RValueStr | None = pydantic.Field(default=None, description="")
+    insulating_material: CladdingInsulatingMaterial | None = pydantic.Field(
+        default=None, description="", examples=["No Insulation"]
     )
 
 
@@ -188,10 +201,12 @@ class CladdingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMStr | None = pyd.Field(default=None, description="", example="10 mm")
-    facing_material: CladdingFacingMaterial | None = pyd.Field(default=None, description="", example="Steel")
+    thickness: LengthMStr | None = pydantic.Field(default=None, description="", examples=["10 mm"])
+    facing_material: CladdingFacingMaterial | None = pydantic.Field(default=None, description="", examples=["Steel"])
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_quantity_unit_factory("m"))
+    @pydantic.field_validator("thickness")
+    def _thickness_is_quantity_validator(cls, value):
+        return validate_quantity_unit_factory("m")(cls, value)
 
     # Nested specs:
     Siding: SidingV1 | None = None

openepd/model/specs/singular/cmu.py

@@ -15,7 +15,8 @@
 #
 from typing import Annotated
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.enums import CmuBlockType, CmuWeightClassification
 from openepd.model.validation.quantity import GwpKgCo2eStr, PressureMPaStr
@@ -27,15 +28,29 @@ class CMUV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    white_cement: bool | None = pyd.Field(default=None, description="", example=True)
-    strength_28d: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    weight_classification: CmuWeightClassification | None = pyd.Field(default=None, description="", example="Normal")
-    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: Annotated[GwpKgCo2eStr | None, CodegenSpec(override_type=GwpKgCo2eStr)] = pyd.Field(
-        default=None, description="", example="1 kgCO2e"
+    white_cement: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    strength_28d: PressureMPaStr | None = pydantic.Field(default=None, description="", examples=["1 MPa"])
+    weight_classification: CmuWeightClassification | None = pydantic.Field(
+        default=None, description="", examples=["Normal"]
+    )
+    block_type: CmuBlockType | None = pydantic.Field(default=None, description="", examples=["Gray"])
+    insulated: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    sound_performance: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    b1_recarbonation: Annotated[GwpKgCo2eStr | None, CodegenSpec(override_type=GwpKgCo2eStr)] = pydantic.Field(
+        default=None, description="", examples=["1 kgCO2e"]
     )
-    b1_recarbonation_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
-        default=None, description="", example=2.3
+    b1_recarbonation_z: Annotated[float | None, CodegenSpec(override_type=float)] = pydantic.Field(
+        default=None, description="", examples=[2.3]
     )

openepd/model/specs/singular/common.py

@@ -13,7 +13,8 @@
 #  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.org import OrgRef
 
@@ -21,6 +22,6 @@ from openepd.model.org import OrgRef
 class HasForestPracticesCertifiers(BaseOpenEpdSchema):
     """An interface for models which are linked to forest practices certifiers."""
 
-    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(
+    forest_practices_certifiers: list[OrgRef] | None = pydantic.Field(
         default=None, description="List of organizations that certify forest practices."
     )

openepd/model/specs/singular/concrete.py

@@ -15,12 +15,12 @@
 #
 from typing import Annotated, Literal
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.concrete import Cementitious, ConcreteTypicalApplication
 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 (
     LengthInchStr,
     LengthMmStr,
@@ -49,13 +49,13 @@ class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    flexion_strength: PressureMPaStr | None = pyd.Field(
-        default=None, description="Concrete flexural strength.", example="30 MPa"
+    flexion_strength: PressureMPaStr | None = pydantic.Field(
+        default=None, description="Concrete flexural strength.", examples=["30 MPa"]
     )
 
-    _concrete_flexion_strength_is_quantity_validator = pyd.validator("flexion_strength", allow_reuse=True)(
-        validate_quantity_unit_factory("MPa")
-    )
+    @pydantic.field_validator("flexion_strength", mode="before", check_fields=False)
+    def _validate_flexion_strength(cls, value):
+        return validate_quantity_unit_factory("MPa")(cls, value)
 
 
 class FlowableFillV1(BaseOpenEpdHierarchicalSpec):
@@ -110,61 +110,96 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    lightweight: bool | None = pyd.Field(default=None, description="Product is lightweight", example=True)
+    lightweight: bool | None = pydantic.Field(
+        default=None,
+        description="Product is lightweight",
+        examples=[True],
+    )
 
-    strength_28d: PressureMPaStr | None = pyd.Field(
-        default=None, description="Concrete strength after 28 days", example="1 MPa"
+    strength_28d: PressureMPaStr | None = pydantic.Field(
+        default=None, description="Concrete strength after 28 days", examples=["1 MPa"]
     )
-    strength_other: PressureMPaStr | None = pyd.Field(
+    strength_other: PressureMPaStr | None = pydantic.Field(
         default=None,
         description="A strength spec which is to be reached later other 28 days (e.g. 42d)",
-        example="30 MPa",
+        examples=["30 MPa"],
     )
     strength_other_d: Annotated[
         Literal[3, 7, 14, 42, 56, 72, 96, 120] | None,
         CodegenSpec(override_type=Literal[3, 7, 14, 42, 56, 72, 96, 120]),
-    ] = pyd.Field(default=None, description="Test Day for strength_other", example=42)
+    ] = pydantic.Field(default=None, description="Test Day for strength_other", examples=[42])
 
-    slump: LengthInchStr | None = pyd.Field(default=None, description="", example="2 in")
-    min_slump: LengthInchStr | None = pyd.Field(default=None, description="Minimum test slump", example="2 in")
-    max_slump: LengthInchStr | None = pyd.Field(default=None, description="", example="2 in")
+    slump: LengthInchStr | None = pydantic.Field(default=None, description="", examples=["2 in"])
+    min_slump: LengthInchStr | None = pydantic.Field(default=None, description="Minimum test slump", examples=["2 in"])
+    max_slump: LengthInchStr | None = pydantic.Field(default=None, description="", examples=["2 in"])
 
-    min_pipeline_size: LengthMmStr | None = pyd.Field(
-        default=None, description="Minimum pipeline size", example="200 mm"
+    min_pipeline_size: LengthMmStr | None = pydantic.Field(
+        default=None, description="Minimum pipeline size", examples=["200 mm"]
     )
-    w_c_ratio: RatioFloat | None = pyd.Field(
-        default=None, description="Ratio of water to cement", example=0.5, ge=0, le=1
+    w_c_ratio: float | None = pydantic.Field(
+        default=None, description="Ratio of water to cement", examples=[0.5], ge=0, le=1
+    )
+    air_entrain: bool | None = pydantic.Field(
+        default=None,
+        description="Air Entrainment",
+        examples=[True],
+    )
+    co2_entrain: bool | None = pydantic.Field(
+        default=None,
+        description="CO2 Curing",
+        examples=[True],
+    )
+    self_consolidating: bool | None = pydantic.Field(
+        default=None,
+        description="Self Compacting",
+        examples=[True],
+    )
+    white_cement: bool | None = pydantic.Field(
+        default=None,
+        description="White Cement",
+        examples=[True],
+    )
+    plc: bool | None = pydantic.Field(
+        default=None,
+        description="Portland Limestone Cement",
+        examples=[True],
+    )
+    finishable: bool | None = pydantic.Field(
+        default=None,
+        description="Finishable",
+        examples=[True],
+    )
+    fiber_reinforced: bool | None = pydantic.Field(
+        default=None,
+        description="fiber_reinforced",
+        examples=[True],
     )
-    air_entrain: bool | None = pyd.Field(default=None, description="Air Entrainment", example=True)
-    co2_entrain: bool | None = pyd.Field(default=None, description="CO2 Curing", example=True)
-    self_consolidating: bool | None = pyd.Field(default=None, description="Self Compacting", example=True)
-    white_cement: bool | None = pyd.Field(default=None, description="White Cement", example=True)
-    plc: bool | None = pyd.Field(default=None, description="Portland Limestone Cement", example=True)
-    finishable: bool | None = pyd.Field(default=None, description="Finishable", example=True)
-    fiber_reinforced: bool | None = pyd.Field(default=None, description="fiber_reinforced", example=True)
 
-    cementitious: Cementitious | None = pyd.Field(
-        default=None, description="List of cementitious materials, and proportion by mass"
+    cementitious: Cementitious | None = pydantic.Field(
+        default=None,
+        description="List of cementitious materials, and proportion by mass",
     )
 
-    aggregate_size_max: LengthMmStr | None = pyd.Field(
+    aggregate_size_max: LengthMmStr | None = pydantic.Field(
         default=None,
         description="The smallest sieve size for which the entire amount of aggregate is able to pass. "
         "Parameter describes diameter of aggregate",
-        example="8 mm",
+        examples=["8 mm"],
     )
-    cement_content: MassKgStr | None = pyd.Field(default=None, example="1 kg")
+    cement_content: MassKgStr | None = pydantic.Field(default=None, examples=["1 kg"])
 
-    aci_exposure_classes: list[AciExposureClass] | None = pyd.Field(
-        default=None, description="List of ACI exposure classes", example=["aci.F0"]
+    aci_exposure_classes: list[AciExposureClass] | None = pydantic.Field(
+        default=None, description="List of ACI exposure classes", examples=[["aci.F0"]]
     )
-    csa_exposure_classes: list[CsaExposureClass] | None = pyd.Field(
-        default=None, description="List of CSA exposure classes", example=["csa.C-2"]
+    csa_exposure_classes: list[CsaExposureClass] | None = pydantic.Field(
+        default=None, description="List of CSA exposure classes", examples=[["csa.C-2"]]
     )
-    en_exposure_classes: list[EnExposureClass] | None = pyd.Field(
-        default=None, description="List of EN exposure classes", example=["en206.X0"]
+    en_exposure_classes: list[EnExposureClass] | None = pydantic.Field(
+        default=None, description="List of EN exposure classes", examples=[["en206.X0"]]
+    )
+    typical_application: ConcreteTypicalApplication | None = pydantic.Field(
+        default=None, description="Typical Application"
     )
-    typical_application: ConcreteTypicalApplication | None = pyd.Field(default=None, description="Typical Application")
 
     # Nested specs:
     CementGrout: CementGroutV1 | None = None
@@ -174,12 +209,14 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
     ReadyMix: ReadyMixV1 | None = None
     Shotcrete: ShotcreteV1 | None = None
 
-    _aci_exposure_classes_exclusive_groups_validator = pyd.validator("aci_exposure_classes", allow_reuse=True)(
-        exclusive_groups_validator_factory(AciExposureClass)
-    )
-    _en_exposure_classes_exclusive_groups_validator = pyd.validator("en_exposure_classes", allow_reuse=True)(
-        exclusive_groups_validator_factory(EnExposureClass)
-    )
-    _csa_exposure_classes_exclusive_groups_validator = pyd.validator("csa_exposure_classes", allow_reuse=True)(
-        exclusive_groups_validator_factory(CsaExposureClass)
-    )
+    @pydantic.field_validator("aci_exposure_classes", mode="before", check_fields=False)
+    def _validate_aci_exposure_classes(cls, value):
+        return exclusive_groups_validator_factory(AciExposureClass)(cls, value)
+
+    @pydantic.field_validator("en_exposure_classes", mode="before", check_fields=False)
+    def _validate_en_exposure_classes(cls, value):
+        return exclusive_groups_validator_factory(EnExposureClass)(cls, value)
+
+    @pydantic.field_validator("csa_exposure_classes", mode="before", check_fields=False)
+    def _validate_csa_exposure_classes(cls, value):
+        return exclusive_groups_validator_factory(CsaExposureClass)(cls, value)

openepd/model/specs/singular/conveying_equipment.py

@@ -13,7 +13,8 @@
 #  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.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import ElevatorsBuildingRise, ElevatorsUsageIntensity
 from openepd.model.validation.quantity import CapacityPerHourStr, LengthMStr, MassKgStr, SpeedStr
@@ -27,21 +28,33 @@ class EscalatorsV1(BaseOpenEpdHierarchicalSpec):
     which conveys people between the floors of a building.
     """
 
-    vertical_rise: LengthMStr | None = pyd.Field(
+    vertical_rise: LengthMStr | None = pydantic.Field(
         default=None,
         description="The vertical distance between the top and bottom landings of an escalator",
-        example="1 m",
+        examples=["1 m"],
+    )
+    speed: SpeedStr | None = pydantic.Field(
+        default=None,
+        description="Reference speed of the escalator",
+        examples=["1 m / s"],
     )
-    speed: SpeedStr | None = pyd.Field(default=None, description="Reference speed of the escalator", example="1 m / s")
-    step_width: LengthMStr | None = pyd.Field(default=None, description="Width of the escalator steps", example="1 m")
-    max_capacity: CapacityPerHourStr | None = pyd.Field(
-        default=None, description="Max capacity of escalator in persons per hour", example="1 hour^-1"
+    step_width: LengthMStr | None = pydantic.Field(
+        default=None, description="Width of the escalator steps", examples=["1 m"]
     )
-    indoor: bool | None = pyd.Field(
-        default=None, description="Escalator can be used for indoor applications", example=True
+    max_capacity: CapacityPerHourStr | None = pydantic.Field(
+        default=None,
+        description="Max capacity of escalator in persons per hour",
+        examples=["1 hour^-1"],
     )
-    outdoor: bool | None = pyd.Field(
-        default=None, description="Escalator can be used for outdoor applications", example=True
+    indoor: bool | None = pydantic.Field(
+        default=None,
+        description="Escalator can be used for indoor applications",
+        examples=[True],
+    )
+    outdoor: bool | None = pydantic.Field(
+        default=None,
+        description="Escalator can be used for outdoor applications",
+        examples=[True],
     )
 
     _EXT_VERSION = "1.1"
@@ -53,13 +66,13 @@ class ElevatorsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    usage_intensity: list[ElevatorsUsageIntensity] | None = pyd.Field(
-        default=None, description="", example=["Very low"]
+    usage_intensity: list[ElevatorsUsageIntensity] | None = pydantic.Field(
+        default=None, description="", examples=[["Very low"]]
     )
-    travel_length: LengthMStr | None = pyd.Field(default=None, description="", example="1 m")
-    rated_load: MassKgStr | None = pyd.Field(default=None, description="", example="1 kg")
-    rated_speed: SpeedStr | None = pyd.Field(default=None, description="", example="1 m / s")
-    building_rise: ElevatorsBuildingRise | None = pyd.Field(default=None, description="", example="Low-rise")
+    travel_length: LengthMStr | None = pydantic.Field(default=None, description="", examples=["1 m"])
+    rated_load: MassKgStr | None = pydantic.Field(default=None, description="", examples=["1 kg"])
+    rated_speed: SpeedStr | None = pydantic.Field(default=None, description="", examples=["1 m / s"])
+    building_rise: ElevatorsBuildingRise | None = pydantic.Field(default=None, description="", examples=["Low-rise"])
 
 
 class ConveyingEquipmentV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/singular/deprecated/__init__.py

@@ -15,7 +15,8 @@
 #
 from typing import Any, ClassVar
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.base import BaseOpenEpdSchema
 
 
@@ -48,7 +49,7 @@ def get_safely(d: dict, path: str) -> tuple[bool, Any]:
                 if p not in current:
                     return False, None
                 current = current.get(p)
-            case pyd.BaseModel() as model:
+            case pydantic.BaseModel() as model:
                 if not hasattr(current, p) or p not in model.__fields_set__:
                     return False, None
                 current = getattr(current, p)