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

openepd/model/specs/singular/furnishings.py

@@ -13,10 +13,10 @@
 #  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 CountertopMaterial
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import AreaM2Str, LengthMmStr, VolumeStr
 
 
@@ -38,8 +38,8 @@ class CountertopsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="30 mm")
-    countertop_material: CountertopMaterial | None = pyd.Field(default=None, description="", example="Stone")
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["30 mm"])
+    countertop_material: CountertopMaterial | None = pydantic.Field(default=None, description="", examples=["Stone"])
 
 
 class DemountablePartitionsV1(BaseOpenEpdHierarchicalSpec):
@@ -156,35 +156,37 @@ class FurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.1"
 
     # Own fields:
-    functional_floor_area_m2: AreaM2Str | None = pyd.Field(
+    functional_floor_area_m2: AreaM2Str | None = pydantic.Field(
         default=None,
         title="Functional Floor Area",
         description="The floor area that the product occupies.",
-        example="1 m2",
+        examples=["1 m2"],
     )
-    work_surface_area_m2: AreaM2Str | None = pyd.Field(
+    work_surface_area_m2: AreaM2Str | None = pydantic.Field(
         default=None,
         title="Work Surface Area",
         description="The usable work surface area that the product provides.",
-        example="1 m2",
+        examples=["1 m2"],
     )
-    functional_storage_volume_m3: VolumeStr | None = pyd.Field(
+    functional_storage_volume_m3: VolumeStr | None = pydantic.Field(
         default=None,
         title="Functional Storage Volume",
         description="",
-        example="1 m3",
+        examples=["1 m3"],
     )
-    functional_seating_capacity: pyd.NonNegativeInt | None = pyd.Field(
+    functional_seating_capacity: pydantic.NonNegativeInt | None = pydantic.Field(
         default=None,
         title="Functional Seating Capacity",
         description="Intended number of individuals the product seats. This value is used in calculating impact per functional unit.",
-        example=1,
+        examples=[1],
     )
-    installation_waste_factor: RatioFloat | None = pyd.Field(
+    installation_waste_factor: float | None = pydantic.Field(
         default=None,
         title="Installation Waste Factor",
         description="Typical increase in impacts to account for installation waste.",
-        example=0.01,
+        examples=[0.01],
+        ge=0,
+        le=1,
     )
 
     # Nested specs:

openepd/model/specs/singular/manufacturing_inputs.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.concrete import Cementitious
 from openepd.model.specs.enums import (
@@ -39,13 +40,21 @@ class CementV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    cementitious: Cementitious | None = pyd.Field(default=None, description="")
-    white_cement: bool | None = pyd.Field(default=None, description="", example=True)
-    astm_type: CementAstmType | None = pyd.Field(default=None, description="", example="C150 Type I")
-    c1157: list[CementC1157] | None = pyd.Field(default=None, description="", example=["GU"])
-    csa_a3001: list[CementCsaA3001] | None = pyd.Field(default=None, description="", example=["A3001 GU"])
-    en197_1: CementEn197_1 | None = pyd.Field(default=None, description="", example="CEM I")
-    oil_well_cement: bool | None = pyd.Field(default=None, description="", example=True)
+    cementitious: Cementitious | None = pydantic.Field(default=None, description="")
+    white_cement: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    astm_type: CementAstmType | None = pydantic.Field(default=None, description="", examples=["C150 Type I"])
+    c1157: list[CementC1157] | None = pydantic.Field(default=None, description="", examples=[["GU"]])
+    csa_a3001: list[CementCsaA3001] | None = pydantic.Field(default=None, description="", examples=[["A3001 GU"]])
+    en197_1: CementEn197_1 | None = pydantic.Field(default=None, description="", examples=["CEM I"])
+    oil_well_cement: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
 
 class MasonryCementV1(BaseOpenEpdHierarchicalSpec):
@@ -58,7 +67,7 @@ class MasonryCementV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    astm_c91_type: MasonryCementAstmC91Type | None = pyd.Field(default=None, description="", example="Type N")
+    astm_c91_type: MasonryCementAstmC91Type | None = pydantic.Field(default=None, description="", examples=["Type N"])
 
 
 class SupplementaryCementitiousMaterialsV1(BaseOpenEpdHierarchicalSpec):
@@ -67,7 +76,7 @@ class SupplementaryCementitiousMaterialsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    cement_scm: list[CementScm] | None = pyd.Field(default=None, description="", example=["ggbs"])
+    cement_scm: list[CementScm] | None = pydantic.Field(default=None, description="", examples=[["ggbs"]])
 
 
 class AccessFlooringPedestalsV1(BaseOpenEpdHierarchicalSpec):
@@ -93,8 +102,8 @@ class CarpetFiberV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    yarn_material: CarpetYarnType | None = pyd.Field(default=None, description="", example="Nylon 6,6")
-    yarn_recycled_content: float | None = pyd.Field(default=None, description="", example=2.3)
+    yarn_material: CarpetYarnType | None = pydantic.Field(default=None, description="", examples=["Nylon 6,6"])
+    yarn_recycled_content: float | None = pydantic.Field(default=None, description="", examples=[2.3])
 
 
 class CementitiousMaterialsV1(BaseOpenEpdHierarchicalSpec):
@@ -120,7 +129,7 @@ class ConcreteAdmixturesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    effects: list[AdmixtureEffects] | None = pyd.Field(default=None, description="", example=["Air Entrainer"])
+    effects: list[AdmixtureEffects] | None = pydantic.Field(default=None, description="", examples=[["Air Entrainer"]])
 
 
 class TextilesV1(BaseOpenEpdHierarchicalSpec):
@@ -129,7 +138,7 @@ class TextilesV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    fabric_type: list[TextilesFabricType] | None = pyd.Field(default=None, description="", example=["Leather"])
+    fabric_type: list[TextilesFabricType] | None = pydantic.Field(default=None, description="", examples=[["Leather"]])
 
 
 class ManufacturingInputsV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/singular/masonry.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.validation.quantity import (
     PressureMPaStr,
@@ -35,19 +36,23 @@ class AutoclavedAeratedConcreteV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    strength_28d: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    thermal_conductivity: ThermalConductivityStr | None = pyd.Field(
-        default=None, description="", example="1 W / (m * K)"
+    strength_28d: PressureMPaStr | None = pydantic.Field(default=None, description="", examples=["1 MPa"])
+    thermal_conductivity: ThermalConductivityStr | None = pydantic.Field(
+        default=None, description="", examples=["1 W / (m * K)"]
     )
-    white: bool | None = pyd.Field(default=None, description="", example=True)
-
-    _aac_thermal_conductivity_is_quantity_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(
-        validate_quantity_unit_factory("W / (m * K)")
+    white: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
     )
 
-    _aac_thermal_conductivity_min_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(
-        validate_quantity_ge_factory("0 W / (m * K)")
-    )
+    @pydantic.field_validator("thermal_conductivity")
+    def _aac_thermal_conductivity_is_quantity_validator(cls, value):
+        return validate_quantity_unit_factory("W / (m * K)")(value)
+
+    @pydantic.field_validator("thermal_conductivity")
+    def _aac_thermal_conductivity_min_validator(cls, value):
+        return validate_quantity_ge_factory("0 W / (m * K)")(value)
 
 
 class BrickV1(BaseOpenEpdHierarchicalSpec):
@@ -56,15 +61,51 @@ class BrickV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    building: bool | None = pyd.Field(default=None, description="", example=True)
-    facing: bool | None = pyd.Field(default=None, description="", example=True)
-    floor: bool | None = pyd.Field(default=None, description="", example=True)
-    pedestrian: bool | None = pyd.Field(default=None, description="", example=True)
-    paving: bool | None = pyd.Field(default=None, description="", example=True)
-    other: bool | None = pyd.Field(default=None, description="", example=True)
-    chemical_resistant: bool | None = pyd.Field(default=None, description="", example=True)
-    glazed: bool | None = pyd.Field(default=None, description="", example=True)
-    tiles: bool | None = pyd.Field(default=None, description="", example=True)
+    building: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    facing: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    floor: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    pedestrian: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    paving: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    other: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    chemical_resistant: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    glazed: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    tiles: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
 
 class MasonryV1(BaseOpenEpdHierarchicalSpec):
@@ -73,7 +114,11 @@ class MasonryV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    white_cement: bool | None = pyd.Field(default=None, description="", example=True)
+    white_cement: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
     # Nested specs:
     GMU: GMUV1 | None = None

openepd/model/specs/singular/mechanical.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 (
     AhuAirflowControl,
@@ -45,11 +46,11 @@ class HvacVrfIndoorV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    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")
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    cooling_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    airflow_rate: AirflowStr | None = pydantic.Field(default=None, description="", examples=["1 m3 / s"])
+    air_volume: VolumeStr | None = pydantic.Field(default=None, description="", examples=["1 m3"])
 
 
 class HvacVrfOutdoorV1(BaseOpenEpdHierarchicalSpec):
@@ -58,11 +59,11 @@ class HvacVrfOutdoorV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    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")
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    cooling_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    airflow_rate: AirflowStr | None = pydantic.Field(default=None, description="", examples=["1 m3 / s"])
+    air_volume: VolumeStr | None = pydantic.Field(default=None, description="", examples=["1 m3"])
 
 
 class HvacAirDiffusersV1(BaseOpenEpdHierarchicalSpec):
@@ -77,8 +78,8 @@ class HvacAirFiltersV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    merv_rating: AirFiltersMervRating | None = pyd.Field(default=None, description="", example="MERV 1")
-    media_type: AirFiltersMediaType | None = pyd.Field(default=None, description="", example="Acrylic")
+    merv_rating: AirFiltersMervRating | None = pydantic.Field(default=None, description="", examples=["MERV 1"])
+    media_type: AirFiltersMediaType | None = pydantic.Field(default=None, description="", examples=["Acrylic"])
 
 
 class HvacAHUsV1(BaseOpenEpdHierarchicalSpec):
@@ -92,14 +93,14 @@ class HvacAHUsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # 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: 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")
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    installation: MechanicalInstallation | None = pydantic.Field(default=None, description="", examples=["Indoor"])
+    airflow_rate: AirflowStr | None = pydantic.Field(default=None, description="", examples=["1 m3 / s"])
+    air_volume: VolumeStr | None = pydantic.Field(default=None, description="", examples=["1 m3"])
+    cooling_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    airflow_control: AhuAirflowControl | None = pydantic.Field(default=None, description="", examples=["CAV"])
+    zone_control: AhuZoneControl | None = pydantic.Field(default=None, description="", examples=["Single Zone"])
 
 
 class HvacBoilersV1(BaseOpenEpdHierarchicalSpec):
@@ -108,10 +109,10 @@ class HvacBoilersV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    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: FlowRateStr | None = pydantic.Field(default=None, description="", examples=["1 l / min"])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    configuration: BoilerConfiguration | None = pydantic.Field(default=None, description="", examples=["Hot water"])
+    fuel_type: BoilerEquipmentFuelType | None = pydantic.Field(default=None, description="", examples=["Coal"])
 
 
 class HvacChillersV1(BaseOpenEpdHierarchicalSpec):
@@ -125,12 +126,12 @@ class HvacChillersV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # 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: 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")
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    installation: MechanicalInstallation | None = pydantic.Field(default=None, description="", examples=["Indoor"])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    cooling_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    air_volume: VolumeStr | None = pydantic.Field(default=None, description="", examples=["1 m3"])
+    airflow_rate: AirflowStr | None = pydantic.Field(default=None, description="", examples=["1 m3 / s"])
 
 
 class HvacFansV1(BaseOpenEpdHierarchicalSpec):
@@ -145,12 +146,12 @@ class HvacHeatPumpsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    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")
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    cooling_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    heating_capacity: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
+    air_volume: VolumeStr | None = pydantic.Field(default=None, description="", examples=["1 m3"])
+    airflow_rate: AirflowStr | None = pydantic.Field(default=None, description="", examples=["1 m3 / s"])
+    heat_pumps_type: HeatPumpType | None = pydantic.Field(default=None, description="", examples=["Air-to-Water"])
 
 
 class HvacHeatExV1(BaseOpenEpdHierarchicalSpec):
@@ -164,9 +165,9 @@ class HvacHeatExV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    refrigerants: list[MechanicalRefrigerants] | None = pyd.Field(default=None, description="", example=["R11"])
-    heat_exchangers_type: HvacHeatExchangersType | None = pyd.Field(
-        default=None, description="", example="Shell and Tube"
+    refrigerants: list[MechanicalRefrigerants] | None = pydantic.Field(default=None, description="", examples=[["R11"]])
+    heat_exchangers_type: HvacHeatExchangersType | None = pydantic.Field(
+        default=None, description="", examples=["Shell and Tube"]
     )
 
 
@@ -181,9 +182,9 @@ class HvacPumpsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    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: PowerStr | None = pyd.Field(default=None, description="", example="1000.0 W")
+    flow_rate: FlowRateStr | None = pydantic.Field(default=None, description="", examples=["1 l / min"])
+    pump_discharge_pressure: PressureMPaStr | None = pydantic.Field(default=None, description="", examples=["1 MPa"])
+    pump_horsepower: PowerStr | None = pydantic.Field(default=None, description="", examples=["1000.0 W"])
 
 
 class HvacRTUsV1(BaseOpenEpdHierarchicalSpec):
@@ -213,11 +214,11 @@ class HvacDuctsV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    shape: HvacDuctShape | None = pyd.Field(default=None, description="Hvac duct shape", example="Rectangular")
-    material: HvacDuctMaterial | None = pyd.Field(
-        default=None, description="Hvac duct material", example="Galvanized Steel"
+    shape: HvacDuctShape | None = pydantic.Field(default=None, description="Hvac duct shape", examples=["Rectangular"])
+    material: HvacDuctMaterial | None = pydantic.Field(
+        default=None, description="Hvac duct material", examples=["Galvanized Steel"]
     )
-    type: HvacDuctType | None = pyd.Field(default=None, description="Hvac duct type", example="Flexible")
+    type: HvacDuctType | None = pydantic.Field(default=None, description="Hvac duct type", examples=["Flexible"])
 
 
 class MechanicalV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/singular/mechanical_insulation.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 InsulatingMaterial, InsulationIntendedApplication
 from openepd.model.validation.quantity import LengthMmStr
@@ -29,9 +30,9 @@ class MechanicalInsulationV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    r_value: float | None = pyd.Field(default=None, description="", example=2.3)
-    material: InsulatingMaterial | None = pyd.Field(default=None, description="", example="Mineral Wool")
-    intended_application: list[InsulationIntendedApplication] | None = pyd.Field(
-        default=None, description="", example=["Wall & General"]
+    r_value: float | None = pydantic.Field(default=None, description="", examples=[2.3])
+    material: InsulatingMaterial | None = pydantic.Field(default=None, description="", examples=["Mineral Wool"])
+    intended_application: list[InsulationIntendedApplication] | None = pydantic.Field(
+        default=None, description="", examples=[["Wall & General"]]
     )
-    thickness_per_declared_unit: LengthMmStr | None = pyd.Field(default=None, description="", example="20 mm")
+    thickness_per_declared_unit: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["20 mm"])

openepd/model/specs/singular/mixins/conduit_mixin.py

@@ -15,7 +15,8 @@
 #
 __all__ = ["ConduitMixin"]
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.specs.base import BaseOpenEpdSpec
 from openepd.model.specs.enums import ConduitMaterial
 from openepd.model.validation.quantity import LengthMmStr
@@ -28,23 +29,25 @@ class ConduitMixin(BaseOpenEpdSpec):
     Those properties are the same for communication and electrical conduits.
     """
 
-    nominal_diameter: LengthMmStr | None = pyd.Field(
+    nominal_diameter: LengthMmStr | None = pydantic.Field(
         default=None,
         description="Nominal Diameter is also known as the mean or average outside diameter.",
-        example="100 mm",
+        examples=["100 mm"],
     )
-    outer_diameter: LengthMmStr | None = pyd.Field(
+    outer_diameter: LengthMmStr | None = pydantic.Field(
         default=None,
         description="The measurement of the distance of a straight line between points on the outer walls of the pipe.",
-        example="100 mm",
+        examples=["100 mm"],
     )
-    inner_diameter: LengthMmStr | None = pyd.Field(
+    inner_diameter: LengthMmStr | None = pydantic.Field(
         default=None,
         description="The measurement of the distance of a straight line between points on the inner walls of the pipe.",
-        example="100 mm",
+        examples=["100 mm"],
     )
-    wall_thickness: LengthMmStr | None = pyd.Field(
-        default=None, description="Conduit wall thickness.", example="100 mm"
+    wall_thickness: LengthMmStr | None = pydantic.Field(
+        default=None, description="Conduit wall thickness.", examples=["100 mm"]
     )
 
-    material: ConduitMaterial | None = pyd.Field(default=None, description="Material of the conduit.", example="PVC")
+    material: ConduitMaterial | None = pydantic.Field(
+        default=None, description="Material of the conduit.", examples=["PVC"]
+    )