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

openepd/model/specs/singular/network_infrastructure.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 (
     CableTraysMaterial,
@@ -42,13 +43,23 @@ class PDUV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    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")
-    pdu_outlets: int | None = pyd.Field(default=None, description="", example=3, le=200)
+    amperage: ElectricalCurrentStr | None = pydantic.Field(default=None, description="", examples=["1 A"])
+    outlet_level_metering: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    outlet_level_switching: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    pdu_technology: PduTechnology | None = pydantic.Field(default=None, description="", examples=["Basic"])
+    pdu_outlets: int | None = pydantic.Field(default=None, description="", examples=[3], le=200)
 
-    _amperage_is_quantity_validator = pyd.validator("amperage", allow_reuse=True)(validate_quantity_unit_factory("A"))
+    @pydantic.field_validator("amperage", mode="before", check_fields=False)
+    def _validate_amperage(cls, value):
+        return validate_quantity_unit_factory("A")(cls, value)
 
 
 class CabinetsRacksAndEnclosuresV1(BaseOpenEpdHierarchicalSpec):
@@ -57,9 +68,9 @@ class CabinetsRacksAndEnclosuresV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    static_load: MassKgStr | None = pyd.Field(default=None, description="", example="1 kg")
-    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: MassKgStr | None = pydantic.Field(default=None, description="", examples=["1 kg"])
+    total_racking_units: int | None = pydantic.Field(default=None, description="", examples=[3])
+    rack_type: RackType | None = pydantic.Field(default=None, description="", examples=["Cabinet"])
 
 
 class DataCablingV1(BaseOpenEpdHierarchicalSpec):
@@ -68,30 +79,52 @@ class DataCablingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    outdoor: bool | None = pyd.Field(default=None, description="", example=True)
-    cabling_category: CablingCategory | None = pyd.Field(default=None, description="", example="Cat7")
-    fire_rating: CablingFireRating | None = pyd.Field(default=None, description="", example="CMP")
-    jacket_material: CablingJacketMaterial | None = pyd.Field(default=None, description="", example="PVC")
-    shielded: bool | None = pyd.Field(
-        default=None, description="Foil or similar electromagnetic shielding", example=True
-    )
-    armored: bool | None = pyd.Field(default=None, description="Steel or similar physical armor jacket", example=True)
-    rohs: bool | None = pyd.Field(default=None, description="Certified ROHS Compliant", example=True)
-    reach: bool | None = pyd.Field(default=None, description="Certified REACH compliant", example=True)
-    zwtl: bool | None = pyd.Field(default=None, description="Certified ZWTL compliant", example=True)
-    connectorized: bool | None = pyd.Field(
+    outdoor: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    cabling_category: CablingCategory | None = pydantic.Field(default=None, description="", examples=["Cat7"])
+    fire_rating: CablingFireRating | None = pydantic.Field(default=None, description="", examples=["CMP"])
+    jacket_material: CablingJacketMaterial | None = pydantic.Field(default=None, description="", examples=["PVC"])
+    shielded: bool | None = pydantic.Field(
+        default=None,
+        description="Foil or similar electromagnetic shielding",
+        examples=[True],
+    )
+    armored: bool | None = pydantic.Field(
+        default=None,
+        description="Steel or similar physical armor jacket",
+        examples=[True],
+    )
+    rohs: bool | None = pydantic.Field(
+        default=None,
+        description="Certified ROHS Compliant",
+        examples=[True],
+    )
+    reach: bool | None = pydantic.Field(
+        default=None,
+        description="Certified REACH compliant",
+        examples=[True],
+    )
+    zwtl: bool | None = pydantic.Field(
+        default=None,
+        description="Certified ZWTL compliant",
+        examples=[True],
+    )
+    connectorized: bool | None = pydantic.Field(
         default=None,
         description="This cable is shipped as a specific length with integrated connectors. Impacts include the "
         "connectors for the specific cable length. Connectors add impact similar to 0.1-0.5 additional "
         "meters of cable",
-        example=True,
+        examples=[True],
     )
-    thin_ethernet: bool | None = pyd.Field(
+    thin_ethernet: bool | None = pydantic.Field(
         default=None,
         description="At least part of this cable has a reduced outer diameter and thinner wires. Thin ethernet cables "
         "have handling advantages and tend to have a reduced impact, but also reduced channel length. "
         "See TIA 568.2-D Annex G.",
-        example=True,
+        examples=[True],
     )
 
 
@@ -105,29 +138,45 @@ class FloorBoxesAndAccessoriesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    painted: bool | None = pyd.Field(default=None, description="", example=True)
-    fire_classified: bool | None = pyd.Field(
-        default=None, description="Includes hardware to maintain fire rating of the floor", example=True
+    painted: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    fire_classified: bool | None = pydantic.Field(
+        default=None,
+        description="Includes hardware to maintain fire rating of the floor",
+        examples=[True],
+    )
+    outdoor: bool | None = pydantic.Field(
+        default=None,
+        description="Floor boxes installed in the ground",
+        examples=[True],
     )
-    outdoor: bool | None = pyd.Field(default=None, description="Floor boxes installed in the ground", example=True)
-    raised: bool | None = pyd.Field(default=None, description="Used in raised or computer style flooring", example=True)
-    poke_through: bool | None = pyd.Field(
+    raised: bool | None = pydantic.Field(
+        default=None,
+        description="Used in raised or computer style flooring",
+        examples=[True],
+    )
+    poke_through: bool | None = pydantic.Field(
         default=None,
         description="Used primarily in retrofit or renovation and will maintain fire rating of the floor",
-        example=True,
+        examples=[True],
     )
-    cover: bool | None = pyd.Field(
-        default=None, description="Floor box cover or lid for use with a separate floor box", example=True
+    cover: bool | None = pydantic.Field(
+        default=None,
+        description="Floor box cover or lid for use with a separate floor box",
+        examples=[True],
     )
-    outlets: int | None = pyd.Field(
+    outlets: int | None = pydantic.Field(
         default=None,
         description="Number of outlet ports from floor box, including power, data, video, and other connections",
-        example=3,
+        examples=[3],
         le=16,
     )
-    material: FloorBoxMaterial | None = pyd.Field(default=None, description="", example="Metallic Box")
-    cover_material: FloorBoxCoverMaterial | None = pyd.Field(default=None, description="", example="Brass")
-    floor_material: FloorBoxFloorMaterial | None = pyd.Field(default=None, description="", example="Concrete")
+    material: FloorBoxMaterial | None = pydantic.Field(default=None, description="", examples=["Metallic Box"])
+    cover_material: FloorBoxCoverMaterial | None = pydantic.Field(default=None, description="", examples=["Brass"])
+    floor_material: FloorBoxFloorMaterial | None = pydantic.Field(default=None, description="", examples=["Concrete"])
 
 
 class NetworkingCableTraysV1(BaseOpenEpdHierarchicalSpec):
@@ -141,14 +190,18 @@ class NetworkingCableTraysV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    height: LengthMmStr | None = pyd.Field(default=None, description="", example="100 mm")
-    width: LengthMmStr | None = pyd.Field(default=None, description="", example="100 mm")
-    depth: LengthMmStr | None = pyd.Field(default=None, description="Depth of enclosure system", example="1 m")
-    static_load: MassKgStr | None = pyd.Field(default=None, description="Mass that the unit can hold", example="1 kg")
-    ventilated: bool | None = pyd.Field(
-        default=None, description="At least 40% of the tray base is open to air flow", example=True
+    height: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["100 mm"])
+    width: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["100 mm"])
+    depth: LengthMmStr | None = pydantic.Field(default=None, description="Depth of enclosure system", examples=["1 m"])
+    static_load: MassKgStr | None = pydantic.Field(
+        default=None, description="Mass that the unit can hold", examples=["1 kg"]
+    )
+    ventilated: bool | None = pydantic.Field(
+        default=None,
+        description="At least 40% of the tray base is open to air flow",
+        examples=[True],
     )
-    material: CableTraysMaterial | None = pyd.Field(default=None, description="", example="Stainless Steel")
+    material: CableTraysMaterial | None = pydantic.Field(default=None, description="", examples=["Stainless Steel"])
 
 
 class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
@@ -161,15 +214,21 @@ class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    width: LengthMmStr | None = pyd.Field(default=None, description="", example="100 mm")
-    depth: LengthMmStr | None = pyd.Field(default=None, description="Depth of enclosure system", example="100 mm")
-    painted: bool | None = pyd.Field(default=None, description="", example=True)
-    divided: bool | None = pyd.Field(
+    width: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["100 mm"])
+    depth: LengthMmStr | None = pydantic.Field(
+        default=None, description="Depth of enclosure system", examples=["100 mm"]
+    )
+    painted: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    divided: bool | None = pydantic.Field(
         default=None,
         description="Dual service raceway for high and low voltage data and power applications",
-        example=True,
+        examples=[True],
     )
-    raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
+    raceways_material: RacewaysMaterial | None = pydantic.Field(default=None, description="", examples=["Aluminum"])
 
 
 class CommunicationsConduitV1(BaseOpenEpdHierarchicalSpec, ConduitMixin):

openepd/model/specs/singular/openings.py

@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+import pydantic
 
-from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import (
@@ -25,7 +25,6 @@ from openepd.model.specs.enums import (
     Spacer,
     ThermalSeparation,
 )
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import (
     LengthMmStr,
     PressureMPaStr,
@@ -38,90 +37,108 @@ from openepd.model.validation.quantity import (
 class GlazingIntendedApplication(BaseOpenEpdSchema):
     """Glass intended application mixin."""
 
-    curtain_wall: bool | None = pyd.Field(default=None, description="Intended for curtain walls. Relevant for IGUs.")
-    r_windows: bool | None = pyd.Field(
+    curtain_wall: bool | None = pydantic.Field(
+        default=None, description="Intended for curtain walls. Relevant for IGUs."
+    )
+    r_windows: bool | None = pydantic.Field(
         default=None,
         description="Intended for residential (NAFS 'R') and similar windows, doors, or skylights. Relevant for IGUs.",
     )
-    lc_windows: bool | None = pyd.Field(
-        default=None, description="Intended for light commercial (NAFS 'LC') and similar windows. Relevant for IGUs."
+    lc_windows: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for light commercial (NAFS 'LC') and similar windows. Relevant for IGUs.",
     )
-    cw_windows: bool | None = pyd.Field(
-        default=None, description="Intended for commercial (NAFS 'CW') and similar windows. Relevant for IGUs."
+    cw_windows: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for commercial (NAFS 'CW') and similar windows. Relevant for IGUs.",
     )
-    aw_windows: bool | None = pyd.Field(
-        default=None, description="Intended for architectural (NAFS 'AW') and similar windows. Relevant for IGUs."
+    aw_windows: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for architectural (NAFS 'AW') and similar windows. Relevant for IGUs.",
     )
-    storefronts: bool | None = pyd.Field(
-        default=None, description="Intended for Storefronts and similar applications. Relevant for IGUs."
+    storefronts: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for Storefronts and similar applications. Relevant for IGUs.",
     )
-    glazed_doors: bool | None = pyd.Field(
-        default=None, description="Intended for Glazed Doors and similar applications. Relevant for IGUs."
+    glazed_doors: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for Glazed Doors and similar applications. Relevant for IGUs.",
     )
-    unit_skylights: bool | None = pyd.Field(
-        default=None, description="Intended for Unit Skylights and similar applications. Relevant for IGUs."
+    unit_skylights: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for Unit Skylights and similar applications. Relevant for IGUs.",
     )
-    sloped_skylights: bool | None = pyd.Field(
+    sloped_skylights: bool | None = pydantic.Field(
         default=None,
         description="Intended for sloped glazing, and architectural skylights, and similar. Relevant for IGUs.",
     )
-    other: bool | None = pyd.Field(
-        default=None, description="Intended for other application not listed. Relevant for IGUs."
+    other: bool | None = pydantic.Field(
+        default=None,
+        description="Intended for other application not listed. Relevant for IGUs.",
     )
 
 
 class GlazingOptionsMixin(BaseOpenEpdSchema):
     """Common glazing options."""
 
-    low_emissivity: bool | None = pyd.Field(default=None, description="Low Emissivity coatings", example=True)
-    electrochromic: bool | None = pyd.Field(
+    low_emissivity: bool | None = pydantic.Field(
+        default=None,
+        description="Low Emissivity coatings",
+        examples=[True],
+    )
+    electrochromic: bool | None = pydantic.Field(
         default=None,
         description="Glazing with an electrically controllable solar heat gain and/or other properties.",
-        example=True,
+        examples=[True],
     )
-    acid_etched: bool | None = pyd.Field(
-        default=None, description="Flat glass that has undergone a chemical etching process.", example=True
+    acid_etched: bool | None = pydantic.Field(
+        default=None,
+        description="Flat glass that has undergone a chemical etching process.",
+        examples=[True],
     )
-    tempered: bool | None = pyd.Field(
+    tempered: bool | None = pydantic.Field(
         default=None,
         description="Consists of a single pane that has been heat-treated to give the glass increased impact "
         "resistance. Standard typically used in North America.",
-        example=True,
+        examples=[True],
     )
-    toughened: bool | None = pyd.Field(
+    toughened: bool | None = pydantic.Field(
         default=None,
         description="Consists of a single pane that has been specially heat-treated to give the glass increased impact "
         "resistance. Standard typically used in Europe.",
-        example=True,
+        examples=[True],
     )
-    laminated: bool | None = pyd.Field(
+    laminated: bool | None = pydantic.Field(
         default=None,
         description="Consists of at least two glass panes lying one on top of the other, with one or several layers of "
         "a tear-resistant, viscoelastic film positioned between the panes, which consist of polyvinyl "
         "butyral (PVB)",
-        example=True,
+        examples=[True],
     )
-    fire_resistant: bool | None = pyd.Field(default=None, example=True)
-    fire_protection: bool | None = pyd.Field(
+    fire_resistant: bool | None = pydantic.Field(
+        default=None,
+        examples=[True],
+    )
+    fire_protection: bool | None = pydantic.Field(
         default=None,
         description="Specifically tested for its ability to block flames and smoke, but not radiant heat. Ranges from"
         " specialty tempered products rated for ~20 minutes to glass ceramics rated up to 3 hours.",
-        example=True,
+        examples=[True],
     )
-    pyrolytic_coated: bool | None = pyd.Field(
+    pyrolytic_coated: bool | None = pydantic.Field(
         default=None,
         description="At least one coating is applied in a pyrolytic process, typically during float glass production.",
-        example=True,
+        examples=[True],
     )
-    sputter_coat: bool | None = pyd.Field(
+    sputter_coat: bool | None = pydantic.Field(
         default=None,
         description="At least one coating is applied using sputter (vacuum deposition) coating.",
-        example=True,
+        examples=[True],
     )
-    solar_heat_gain: RatioFloat | None = pyd.Field(
+    solar_heat_gain: float | None = pydantic.Field(
         default=None,
         description="Solar heat gain, measured at a certain level of Differential Pressure. Range is 0 to 1.",
-        example=0.5,
+        examples=[0.5],
         ge=0,
         le=1,
     )
@@ -181,8 +198,8 @@ class FenestrationFramingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thermal_separation: ThermalSeparation | None = pyd.Field(default=None, example="Aluminium")
-    material: FrameMaterial | None = pyd.Field(default=None, example="Vinyl")
+    thermal_separation: ThermalSeparation | None = pydantic.Field(default=None, examples=["Aluminium"])
+    material: FrameMaterial | None = pydantic.Field(default=None, examples=["Vinyl"])
 
 
 class FenestrationHardwareV1(BaseOpenEpdHierarchicalSpec):
@@ -191,7 +208,7 @@ class FenestrationHardwareV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    function: HardwareFunction | None = pyd.Field(default=None, description="", example="Lock")
+    function: HardwareFunction | None = pydantic.Field(default=None, description="", examples=["Lock"])
 
 
 class FlatGlassPanesV1(BaseOpenEpdHierarchicalSpec):
@@ -200,11 +217,11 @@ class FlatGlassPanesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: FlatGlassPanesThickness | None = pyd.Field(default=None, example="12 mm")
+    thickness: FlatGlassPanesThickness | None = pydantic.Field(default=None, examples=["12 mm"])
 
-    _flat_glass_panes_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_quantity_unit_factory("m")
-    )
+    @pydantic.field_validator("thickness")
+    def _flat_glass_panes_thickness_is_quantity_validator(cls, v):
+        return validate_quantity_unit_factory("m")(cls, v)
 
 
 class ProcessedNonInsulatingGlassPanesV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
@@ -295,7 +312,7 @@ class FenestrationPartsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    intended_application: GlazingIntendedApplication | None = pyd.Field(
+    intended_application: GlazingIntendedApplication | None = pydantic.Field(
         default=None, description="Intended application."
     )
 
@@ -318,27 +335,29 @@ class GlassPanesV1(BaseOpenEpdHierarchicalSpec):
 class NAFSPerformanceClass(BaseOpenEpdSchema):
     """NAFS Performance class."""
 
-    r: bool | None = pyd.Field(
-        default=None, description="Residential; commonly used in one- and two-family dwellings.", example=True
+    r: bool | None = pydantic.Field(
+        default=None,
+        description="Residential; commonly used in one- and two-family dwellings.",
+        examples=[True],
     )
-    lc: bool | None = pyd.Field(
+    lc: bool | None = pydantic.Field(
         default=None,
         description="Light Commercial: commonly used in low-rise and mid-rise multi-family dwellings and other "
         "buildings where larger sizes and higher loading requirements are expected.",
-        example=True,
+        examples=[True],
     )
-    cw: bool | None = pyd.Field(
+    cw: bool | None = pydantic.Field(
         default=None,
         description="Commercial Window: commonly used in low-rise and mid-rise buildings where larger sizes, higher "
         "loading requirements, limits on deflection, and heavy use are expected.",
-        example=True,
+        examples=[True],
     )
-    aw: bool | None = pyd.Field(
+    aw: bool | None = pydantic.Field(
         default=None,
         description="Architectural Window: commonly used in high-rise and mid-rise buildings to meet increased "
         "loading requirements and limits on deflection, and in buildings where frequent and extreme use "
         "of the fenestration products is expected.",
-        example=True,
+        examples=[True],
     )
 
 
@@ -348,49 +367,52 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    hurricane_resistant: bool | None = pyd.Field(
-        default=None, description="The product has been designed to resist windborne debris.", example=True
+    hurricane_resistant: bool | None = pydantic.Field(
+        default=None,
+        description="The product has been designed to resist windborne debris.",
+        examples=[True],
     )
 
-    assembly_u_factor: UFactorStr | None = pyd.Field(
+    assembly_u_factor: UFactorStr | None = pydantic.Field(
         default=None,
         description="Weighted average conductance of heat across assembly (including frame).",
-        example="1 USI",
+        examples=["1 USI"],
     )
-    air_infiltration: SpeedStr | None = pyd.Field(
+    air_infiltration: SpeedStr | None = pydantic.Field(
         default=None,
         description="Air infiltration, measured at a certain level of Differential Pressure.",
-        example="1 m3 / m2 / s",
+        examples=["1 m3 / m2 / s"],
     )
 
-    thermal_separation: ThermalSeparation | None = pyd.Field(default=None, example="Aluminium")
-    dp_rating: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    glass_panes: int | None = pyd.Field(
+    thermal_separation: ThermalSeparation | None = pydantic.Field(default=None, examples=["Aluminium"])
+    dp_rating: PressureMPaStr | None = pydantic.Field(default=None, description="", examples=["1 MPa"])
+    glass_panes: int | None = pydantic.Field(
         default=None,
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
-        example=3,
+        examples=[3],
     )
 
-    performance_class: NAFSPerformanceClass | None = pyd.Field(
+    performance_class: NAFSPerformanceClass | None = pydantic.Field(
         default=None, description="Performance class according to NAFS."
     )
 
-    performance_grade: NAFSPerformanceGrade | None = pyd.Field(
+    performance_grade: NAFSPerformanceGrade | None = pydantic.Field(
         default=None,
         description="NAFS Performance Grade. The NAFS Performance Grade is a number that represents the performance "
         "of the glazing product. The higher the number, the better the performance. The NAFS Performance "
         "Grade is calculated using the NAFS Performance Class, the NAFS Performance Index, and the NAFS "
         "Performance Factor. While it is expressed as pressure, there are specific values which are "
         "allowed. The values are listed in the enum.",
-        example="95 psf",
+        examples=["95 psf"],
     )
 
-    _assembly_u_factor_is_quantity_validator = pyd.validator("assembly_u_factor", allow_reuse=True)(
-        validate_quantity_unit_factory("USI")
-    )
-    _nafs_performance_grade_is_quantity_validator = pyd.validator("performance_grade", allow_reuse=True)(
-        validate_quantity_unit_factory("psf")
-    )
+    @pydantic.field_validator("assembly_u_factor")
+    def _assembly_u_factor_is_quantity_validator(cls, v):
+        return validate_quantity_unit_factory("USI")(cls, v)
+
+    @pydantic.field_validator("performance_grade")
+    def _nafs_performance_grade_is_quantity_validator(cls, v):
+        return validate_quantity_unit_factory("psf")(cls, v)
 
     # Nested specs:
     GlazedDoors: GlazedDoorsV1 | None = None
@@ -404,38 +426,48 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    intended_application: GlazingIntendedApplication | None = pyd.Field(
+    intended_application: GlazingIntendedApplication | None = pydantic.Field(
         default=None, description="Intended application for IGUs."
     )
 
-    hurricane_resistant: bool | None = pyd.Field(default=None, example=True)
+    hurricane_resistant: bool | None = pydantic.Field(
+        default=None,
+        examples=[True],
+    )
 
-    dp_rating: PressureMPaStr | None = pyd.Field(
-        default=None, description="Maximum Differential Pressure, a measure of wind tolerance.", example="1 MPa"
+    dp_rating: PressureMPaStr | None = pydantic.Field(
+        default=None,
+        description="Maximum Differential Pressure, a measure of wind tolerance.",
+        examples=["1 MPa"],
     )
-    air_infiltration: SpeedStr | None = pyd.Field(
+    air_infiltration: SpeedStr | None = pydantic.Field(
         default=None,
         description="Air infiltration, measured at a certain level of Differential Pressure.",
-        example="1 m3 / m2 / s",
+        examples=["1 m3 / m2 / s"],
     )
-    glass_panes: int | None = pyd.Field(
+    glass_panes: int | None = pydantic.Field(
         default=None,
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
-        example=3,
+        examples=[3],
     )
-    cog_u_factor: UFactorStr | None = pyd.Field(
-        default=None, description="Conductance of heat at center of glass.", example="1 USI"
+    cog_u_factor: UFactorStr | None = pydantic.Field(
+        default=None,
+        description="Conductance of heat at center of glass.",
+        examples=["1 USI"],
     )
-    spacer: Spacer | None = pyd.Field(
-        default=None, description="Spacer material for Integrated Glass Unit.", example="Aluminium"
+    spacer: Spacer | None = pydantic.Field(
+        default=None,
+        description="Spacer material for Integrated Glass Unit.",
+        examples=["Aluminium"],
     )
 
-    _dp_rating_is_quantity_validator = pyd.validator("dp_rating", allow_reuse=True)(
-        validate_quantity_unit_factory("MPa")
-    )
-    _cog_u_factor_is_quantity_validator = pyd.validator("cog_u_factor", allow_reuse=True)(
-        validate_quantity_unit_factory("USI")
-    )
+    @pydantic.field_validator("dp_rating")
+    def _dp_rating_is_quantity_validator(cls, v):
+        return validate_quantity_unit_factory("MPa")(cls, v)
+
+    @pydantic.field_validator("cog_u_factor")
+    def _cog_u_factor_is_quantity_validator(cls, v):
+        return validate_quantity_unit_factory("USI")(cls, v)
 
 
 class CurtainWallsV1(BaseOpenEpdHierarchicalSpec):
@@ -458,8 +490,8 @@ class DoorsAndFramesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    height: LengthMmStr | None = pyd.Field(default=None, example="1200 mm")
-    width: LengthMmStr | None = pyd.Field(default=None, example="600 mm")
+    height: LengthMmStr | None = pydantic.Field(default=None, examples=["1200 mm"])
+    width: LengthMmStr | None = pydantic.Field(default=None, examples=["600 mm"])
 
     # Nested specs:
     IntegratedDoorsOpeningAssemblies: IntegratedDoorsOpeningAssembliesV1 | None = None
@@ -535,7 +567,7 @@ class OpeningsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, example="80 mm")
+    thickness: LengthMmStr | None = pydantic.Field(default=None, examples=["80 mm"])
 
     # Nested specs:
     CurtainWalls: CurtainWallsV1 | None = None