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

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

@@ -15,30 +15,58 @@
 #
 from typing import ClassVar, Literal
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.concrete import Cementitious, ConcreteTypicalApplication
 from openepd.model.specs.enums import AciExposureClass, CsaExposureClass, EnExposureClass
 from openepd.model.specs.singular import BaseCompatibilitySpec
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthInchStr, PressureMPaStr
 
 
 class ConcreteOptions(BaseOpenEpdSchema):
     """Legacy Concrete options model."""
 
-    lightweight: bool | None = pyd.Field(
-        default=None, description="Lightweight. True if < 120lb/ft3 or 1900 kg/m3", example=True
-    )
-    scc: bool | None = pyd.Field(default=None, description="Self Compacting", example=True)
-    finishable: bool | None = pyd.Field(default=None, description="Finishable", example=True)
-    air: bool | None = pyd.Field(default=None, description="Air Entrainment", example=True)
-    co2_entrain: bool | None = pyd.Field(
-        default=None, description="CO2 Curing. Uses intentionally entrained CO2.", 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)
-    fiber_reinforced: bool | None = pyd.Field(default=None, description="fiber_reinforced", example=True)
+    lightweight: bool | None = pydantic.Field(
+        default=None,
+        description="Lightweight. True if < 120lb/ft3 or 1900 kg/m3",
+        examples=[True],
+    )
+    scc: bool | None = pydantic.Field(
+        default=None,
+        description="Self Compacting",
+        examples=[True],
+    )
+    finishable: bool | None = pydantic.Field(
+        default=None,
+        description="Finishable",
+        examples=[True],
+    )
+    air: bool | None = pydantic.Field(
+        default=None,
+        description="Air Entrainment",
+        examples=[True],
+    )
+    co2_entrain: bool | None = pydantic.Field(
+        default=None,
+        description="CO2 Curing. Uses intentionally entrained CO2.",
+        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],
+    )
+    fiber_reinforced: bool | None = pydantic.Field(
+        default=None,
+        description="fiber_reinforced",
+        examples=[True],
+    )
 
 
 class ConcreteOldSpec(BaseCompatibilitySpec):
@@ -67,34 +95,41 @@ class ConcreteOldSpec(BaseCompatibilitySpec):
         "concrete.cementitious": "Concrete.cementitious",
     }
 
-    strength_28d: PressureMPaStr | None = pyd.Field(
-        default=None, description="Compressive Strength at 28 days", example="1 MPa"
+    strength_28d: PressureMPaStr | None = pydantic.Field(
+        default=None, description="Compressive Strength at 28 days", examples=["1 MPa"]
     )
-    slump: LengthInchStr | None = pyd.Field(default=None, description="Minimum test slump", example="2 in")
-    strength_other: PressureMPaStr | None = pyd.Field(
+    slump: LengthInchStr | None = pydantic.Field(default=None, description="Minimum test slump", examples=["2 in"])
+    strength_other: PressureMPaStr | None = pydantic.Field(
         default=None,
         description="One additional strength, which can be early (e.g. 3d) or late (e.g. 96d)",
-        example="30 MPa",
+        examples=["30 MPa"],
     )
-    strength_other_d: Literal[3, 7, 14, 42, 56, 72, 96, 120] | None = pyd.Field(
+    strength_other_d: Literal[3, 7, 14, 42, 56, 72, 96, 120] | None = pydantic.Field(
         default=None,
         description="Days for the strength field above. Required IF strength_other is provided.",
-        example=42,
+        examples=[42],
     )
-    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
     )
-    aci_exposure_classes: list[AciExposureClass] | None = pyd.Field(
-        default=None, description="List of ACI318-19 exposure classes this product meets", example=["aci.F0"]
+    aci_exposure_classes: list[AciExposureClass] | None = pydantic.Field(
+        default=None,
+        description="List of ACI318-19 exposure classes this product meets",
+        examples=[["aci.F0"]],
     )
-    csa_exposure_classes: list[CsaExposureClass] | None = pyd.Field(
-        default=None, description="List of CSA A23.1 exposure classes this product meets", example=["csa.C-2"]
+    csa_exposure_classes: list[CsaExposureClass] | None = pydantic.Field(
+        default=None,
+        description="List of CSA A23.1 exposure classes this product meets",
+        examples=[["csa.C-2"]],
     )
-    en_exposure_classes: list[EnExposureClass] | None = pyd.Field(
-        default=None, description="List of EN206 exposure classes this product meets", example=["en206.X0"]
+    en_exposure_classes: list[EnExposureClass] | None = pydantic.Field(
+        default=None,
+        description="List of EN206 exposure classes this product meets",
+        examples=[["en206.X0"]],
     )
-    application: ConcreteTypicalApplication | None = pyd.Field(default=None, description="Typical Application")
-    options: ConcreteOptions | None = pyd.Field(default=None, description="List of true/false properties")
-    cementitious: Cementitious | None = pyd.Field(
-        default=None, description="List of cementitious materials, and proportion by mass"
+    application: ConcreteTypicalApplication | None = pydantic.Field(default=None, description="Typical Application")
+    options: ConcreteOptions | None = pydantic.Field(default=None, description="List of true/false properties")
+    cementitious: Cementitious | None = pydantic.Field(
+        default=None,
+        description="List of cementitious materials, and proportion by mass",
     )

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

@@ -15,7 +15,8 @@
 #
 from typing import ClassVar
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.enums import SteelComposition
 from openepd.model.specs.singular import BaseCompatibilitySpec
@@ -27,10 +28,22 @@ from openepd.model.validation.quantity import PressureMPaStr
 class SteelOldOptions(BaseOpenEpdSchema):
     """Legacy Steel options model."""
 
-    cold_finished: bool | None = pyd.Field(default=None, description="Cold Finished", example=True)
-    galvanized: bool | None = pyd.Field(default=None, description="Galvanized", example=True)
-    epoxy: bool | None = pyd.Field(default=None, description="Epoxy Coated", example=True)
-    steel_fabricated: bool | None = pyd.Field(default=None, example=True, description="Fabricated")
+    cold_finished: bool | None = pydantic.Field(
+        default=None,
+        description="Cold Finished",
+        examples=[True],
+    )
+    galvanized: bool | None = pydantic.Field(
+        default=None,
+        description="Galvanized",
+        examples=[True],
+    )
+    epoxy: bool | None = pydantic.Field(
+        default=None,
+        description="Epoxy Coated",
+        examples=[True],
+    )
+    steel_fabricated: bool | None = pydantic.Field(default=None, examples=[True], description="Fabricated")
 
 
 class SteelOldSpec(BaseCompatibilitySpec):
@@ -51,25 +64,25 @@ class SteelOldSpec(BaseCompatibilitySpec):
         "steel.options.steel_fabricated": "Steel.RebarSteel.fabricated",
         # last one is tricky as fabricated might be in multiple cases; thus limited support
     }
-    form_factor: str | None = pyd.Field(default=None, description="Product's form factor, read-only.")
-    steel_composition: SteelComposition | None = pyd.Field(
+    form_factor: str | None = pydantic.Field(default=None, description="Product's form factor, read-only.")
+    steel_composition: SteelComposition | None = pydantic.Field(
         default=None,
         description="Basic chemical composition. Generally the ASTM or EN grade is a subcategory of one of these.",
-        example="Carbon",
+        examples=["Carbon"],
     )
-    Fy: PressureMPaStr | None = pyd.Field(
+    Fy: PressureMPaStr | None = pydantic.Field(
         default=None,
         description="Minimum Yield Strength",
-        example="2000 psi",
+        examples=["2000 psi"],
     )
-    making_route: SteelMakingRoute | None = pyd.Field(
+    making_route: SteelMakingRoute | None = pydantic.Field(
         default=None, description="List of true/false properties for steelmaking route"
     )
-    ASTM: list[Standard] | None = pyd.Field(
+    ASTM: list[Standard] | None = pydantic.Field(
         default=None, description="ASTM standard(s) to which this product complies."
     )
-    SAE: list[Standard] | None = pyd.Field(
+    SAE: list[Standard] | None = pydantic.Field(
         default=None, description="AISA/SAE standard(s) to which this product complies."
     )
-    EN: list[Standard] | None = pyd.Field(default=None, description="EN 10027 number(s).")
-    options: SteelOldOptions | None = pyd.Field(default=None, description="List of true/false properties")
+    EN: list[Standard] | None = pydantic.Field(default=None, description="EN 10027 number(s).")
+    options: SteelOldOptions | None = pydantic.Field(default=None, description="List of true/false properties")

openepd/model/specs/singular/electrical.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, EnergySource, RacewaysMaterial
 from openepd.model.specs.singular.mixins.conduit_mixin import ConduitMixin
@@ -61,14 +62,18 @@ class CableTraysV1(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="", example="100 mm")
-    static_load: MassKgStr | None = pyd.Field(default=None, description="", 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="", examples=["100 mm"])
+    static_load: MassKgStr | None = pydantic.Field(default=None, description="", 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],
+    )
+    cable_trays_material: CableTraysMaterial | None = pydantic.Field(
+        default=None, description="", examples=["Stainless Steel"]
     )
-    cable_trays_material: CableTraysMaterial | None = pyd.Field(default=None, description="", example="Stainless Steel")
 
 
 class ElectricalBusesV1(BaseOpenEpdHierarchicalSpec):
@@ -104,11 +109,19 @@ class RacewaysV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    width: LengthMStr | None = pyd.Field(default=None, description="", example="100 mm")
-    depth: LengthMStr | None = pyd.Field(default=None, description="", example="100 mm")
-    painted: bool | None = pyd.Field(default=None, description="", example=True)
-    divided: bool | None = pyd.Field(default=None, description="", example=True)
-    raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
+    width: LengthMStr | None = pydantic.Field(default=None, description="", examples=["100 mm"])
+    depth: LengthMStr | None = pydantic.Field(default=None, description="", examples=["100 mm"])
+    painted: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    divided: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    raceways_material: RacewaysMaterial | None = pydantic.Field(default=None, description="", examples=["Aluminum"])
 
 
 class FueledElectricalGeneratorsV1(BaseOpenEpdHierarchicalSpec):
@@ -147,7 +160,7 @@ class ElectricityFromSpecificGeneratorV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    energy_source: EnergySource | None = pyd.Field(default=None, description="", example="Grid")
+    energy_source: EnergySource | None = pydantic.Field(default=None, description="", examples=["Grid"])
 
 
 class PowerPurchaseAgreementsV1(BaseOpenEpdHierarchicalSpec):
@@ -160,7 +173,7 @@ class PowerPurchaseAgreementsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    energy_source: EnergySource | None = pyd.Field(default=None, description="", example="Grid")
+    energy_source: EnergySource | None = pydantic.Field(default=None, description="", examples=["Grid"])
 
 
 class LightbulbsV1(BaseOpenEpdHierarchicalSpec):
@@ -255,33 +268,48 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    color_temperature: ColorTemperatureStr | None = pyd.Field(default=None, description="", example="1 K")
-    typical_utilization: UtilizationStr | None = pyd.Field(default=None, description="", example="1 h / yr")
-    luminosity: LuminosityStr | None = pyd.Field(default=None, description="", example="1 lumen")
-    wattage: PowerStr | None = pyd.Field(default=None, description="")
-    color_rendering_index: float | None = pyd.Field(default=None, description="", example=2.3)
-    dimmable: bool | None = pyd.Field(default=None, description="", example=True)
-
-    _color_temperature_quantity_ge_validator = pyd.validator("color_temperature", allow_reuse=True)(
-        validate_quantity_ge_factory("1E+03 K")
-    )
-    _color_temperature_quantity_le_validator = pyd.validator("color_temperature", allow_reuse=True)(
-        validate_quantity_le_factory("1E+04 K")
-    )
-    _typical_utilization_unit_validator = pyd.validator("typical_utilization", allow_reuse=True)(
-        validate_quantity_unit_factory("h / yr")
-    )
-    _typical_utilization_quantity_ge_validator = pyd.validator("typical_utilization", allow_reuse=True)(
-        validate_quantity_ge_factory("25 h / yr")
-    )
-    _luminosity_quantity_ge_validator = pyd.validator("luminosity", allow_reuse=True)(
-        validate_quantity_ge_factory("450 lumen")
-    )
-    _luminosity_quantity_le_validator = pyd.validator("luminosity", allow_reuse=True)(
-        validate_quantity_le_factory("2.6E+03 lumen")
+    color_temperature: ColorTemperatureStr | None = pydantic.Field(default=None, description="", examples=["1 K"])
+    typical_utilization: UtilizationStr | None = pydantic.Field(default=None, description="", examples=["1 h / yr"])
+    luminosity: LuminosityStr | None = pydantic.Field(default=None, description="", examples=["1 lumen"])
+    wattage: PowerStr | None = pydantic.Field(default=None, description="")
+    color_rendering_index: float | None = pydantic.Field(default=None, description="", examples=[2.3])
+    dimmable: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
     )
-    _wattage_quantity_ge_validator = pyd.validator("wattage", allow_reuse=True)(validate_quantity_ge_factory("5 W"))
-    _wattage_quantity_le_validator = pyd.validator("wattage", allow_reuse=True)(validate_quantity_le_factory("100 W"))
+
+    @pydantic.field_validator("color_temperature")
+    def _color_temperature_quantity_ge_validator(cls, value):
+        return validate_quantity_ge_factory("1E+03 K")(cls, value)
+
+    @pydantic.field_validator("color_temperature")
+    def _color_temperature_quantity_le_validator(cls, value):
+        return validate_quantity_le_factory("1E+04 K")(cls, value)
+
+    @pydantic.field_validator("typical_utilization")
+    def _typical_utilization_unit_validator(cls, value):
+        return validate_quantity_unit_factory("h / yr")(cls, value)
+
+    @pydantic.field_validator("typical_utilization")
+    def _typical_utilization_quantity_ge_validator(cls, value):
+        return validate_quantity_ge_factory("25 h / yr")(cls, value)
+
+    @pydantic.field_validator("luminosity")
+    def _luminosity_quantity_ge_validator(cls, value):
+        return validate_quantity_ge_factory("450 lumen")(cls, value)
+
+    @pydantic.field_validator("luminosity")
+    def _luminosity_quantity_le_validator(cls, value):
+        return validate_quantity_le_factory("2.6E+03 lumen")(cls, value)
+
+    @pydantic.field_validator("wattage")
+    def _wattage_quantity_ge_validator(cls, value):
+        return validate_quantity_ge_factory("5 W")(cls, value)
+
+    @pydantic.field_validator("wattage")
+    def _wattage_quantity_le_validator(cls, value):
+        return validate_quantity_le_factory("100 W")(cls, value)
 
     # Nested specs:
     Lightbulbs: LightbulbsV1 | None = None