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

openepd/model/specs/singular/thermal_moisture_protection.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 (
     FoamType,
@@ -23,7 +24,6 @@ from openepd.model.specs.enums import (
     RoofCoverBoardsFacing,
     RoofCoverBoardsMaterial,
 )
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr
 
 
@@ -95,7 +95,7 @@ class BoardInsulationV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    compressive_strength: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
+    compressive_strength: PressureMPaStr | None = pydantic.Field(default=None, description="", examples=["1 MPa"])
 
 
 class FoamedInPlaceV1(BaseOpenEpdHierarchicalSpec):
@@ -104,7 +104,7 @@ class FoamedInPlaceV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    foam_type: FoamType | None = pyd.Field(default=None, description="", example="Open-Cell")
+    foam_type: FoamType | None = pydantic.Field(default=None, description="", examples=["Open-Cell"])
 
 
 class SprayedInsulationV1(BaseOpenEpdHierarchicalSpec):
@@ -134,14 +134,30 @@ class MembraneRoofingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
-    sri: float | None = pyd.Field(default=None, description="", example=2.3)
-    total_recycled_content: RatioFloat | None = pyd.Field(default=None, description="", example=0.5, ge=0, le=1)
-    post_consumer_recycled_content: RatioFloat | None = pyd.Field(default=None, description="", example=0.5, ge=0, le=1)
-    reinforcement: MembraneRoofingReinforcement | None = pyd.Field(default=None, description="", example="Polyester")
-    felt_backing: bool | None = pyd.Field(default=None, description="", example=True)
-    nsf347: bool | None = pyd.Field(default=None, description="", example=True)
-    vantage_vinyl: bool | None = pyd.Field(default=None, description="", example=True)
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["10 mm"])
+    sri: float | None = pydantic.Field(default=None, description="", examples=[2.3])
+    total_recycled_content: float | None = pydantic.Field(default=None, description="", examples=[0.5], ge=0, le=1)
+    post_consumer_recycled_content: float | None = pydantic.Field(
+        default=None, description="", examples=[0.5], ge=0, le=1
+    )
+    reinforcement: MembraneRoofingReinforcement | None = pydantic.Field(
+        default=None, description="", examples=["Polyester"]
+    )
+    felt_backing: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    nsf347: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    vantage_vinyl: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
 
     # Nested specs:
     BituminousRoofing: BituminousRoofingV1 | None = None
@@ -159,12 +175,12 @@ class InsulationV1(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="10 mm")
+    thickness_per_declared_unit: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["10 mm"])
 
     # Nested specs:
     BlanketInsulation: BlanketInsulationV1 | None = None
@@ -207,9 +223,9 @@ class RoofCoverBoardsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    material: RoofCoverBoardsMaterial | None = pyd.Field(default=None, description="", example="Gypsum Fiber")
-    facing: list[RoofCoverBoardsFacing] | None = pyd.Field(default=None, description="", example=["Paper"])
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 m")
+    material: RoofCoverBoardsMaterial | None = pydantic.Field(default=None, description="", examples=["Gypsum Fiber"])
+    facing: list[RoofCoverBoardsFacing] | None = pydantic.Field(default=None, description="", examples=[["Paper"]])
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["1 m"])
 
 
 class SteepSlopeRoofingV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/singular/utility_piping.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 BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
 from openepd.model.validation.quantity import LengthMmStr, MassPerLengthStr
@@ -36,8 +37,8 @@ class BuriedPipingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    buried_piping_type: list[BuriedPipingType] | None = pyd.Field(
-        default=None, description="", example=["Water Utilities"]
+    buried_piping_type: list[BuriedPipingType] | None = pydantic.Field(
+        default=None, description="", examples=[["Water Utilities"]]
     )
 
 
@@ -52,11 +53,13 @@ class UtilityPipingV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="6 m")
-    piping_diameter: LengthMmStr | None = pyd.Field(default=None, description="", example="200 mm")
-    mass_per_unit_length: MassPerLengthStr | None = pyd.Field(default=None, description="", example="1 kg / m")
-    piping_ansi_schedule: PipingAnsiSchedule | None = pyd.Field(default=None, description="", example="5")
-    utility_piping_material: UtilityPipingMaterial | None = pyd.Field(default=None, description="", example="PVC")
+    thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["6 m"])
+    piping_diameter: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["200 mm"])
+    mass_per_unit_length: MassPerLengthStr | None = pydantic.Field(default=None, description="", examples=["1 kg / m"])
+    piping_ansi_schedule: PipingAnsiSchedule | None = pydantic.Field(default=None, description="", examples=["5"])
+    utility_piping_material: UtilityPipingMaterial | None = pydantic.Field(
+        default=None, description="", examples=["PVC"]
+    )
 
     # Nested specs:
     BuildingHeatingPiping: BuildingHeatingPipingV1 | None = None

openepd/model/specs/singular/wood.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 (
     AllFabrication,
@@ -27,7 +28,6 @@ from openepd.model.specs.enums import (
     SheathingPanelsFabrication,
 )
 from openepd.model.specs.singular.common import HasForestPracticesCertifiers
-from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr
 
 
@@ -72,8 +72,10 @@ class CompositeLumberV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    fabrication: CompositeLumberFabrication | None = pyd.Field(default=None, description="", example="LVL")
-    timber_species: EngineeredTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
+    fabrication: CompositeLumberFabrication | None = pydantic.Field(default=None, description="", examples=["LVL"])
+    timber_species: EngineeredTimberSpecies | None = pydantic.Field(
+        default=None, description="", examples=["Alaska Cedar"]
+    )
 
 
 class DimensionLumberV1(BaseOpenEpdHierarchicalSpec):
@@ -82,7 +84,7 @@ class DimensionLumberV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Nested specs:
-    timber_species: SawnTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
+    timber_species: SawnTimberSpecies | None = pydantic.Field(default=None, description="", examples=["Alaska Cedar"])
     WoodDecking: WoodDeckingV1 | None = None
     WoodFraming: WoodFramingV1 | None = None
 
@@ -103,8 +105,10 @@ class MassTimberV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
-    fabrication: MassTimberFabrication | None = pyd.Field(default=None, description="", example="CLT")
-    timber_species: EngineeredTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
+    fabrication: MassTimberFabrication | None = pydantic.Field(default=None, description="", examples=["CLT"])
+    timber_species: EngineeredTimberSpecies | None = pydantic.Field(
+        default=None, description="", examples=["Alaska Cedar"]
+    )
 
 
 class NonStructuralWoodV1(BaseOpenEpdHierarchicalSpec):
@@ -134,9 +138,11 @@ class SheathingPanelsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    fabrication: SheathingPanelsFabrication | None = pyd.Field(default=None, description="", example="Plywood")
-    wood_board_thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
-    timber_species: EngineeredTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
+    fabrication: SheathingPanelsFabrication | None = pydantic.Field(default=None, description="", examples=["Plywood"])
+    wood_board_thickness: LengthMmStr | None = pydantic.Field(default=None, description="", examples=["10 mm"])
+    timber_species: EngineeredTimberSpecies | None = pydantic.Field(
+        default=None, description="", examples=["Alaska Cedar"]
+    )
 
 
 class UnfinishedWoodV1(BaseOpenEpdHierarchicalSpec):
@@ -151,25 +157,43 @@ class WoodV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    timber_species: AllTimberSpecies | None = pyd.Field(
-        default=None, description="Timber species", example="Alaska Cedar"
+    timber_species: AllTimberSpecies | None = pydantic.Field(
+        default=None, description="Timber species", examples=["Alaska Cedar"]
+    )
+    fabrication: AllFabrication | None = pydantic.Field(
+        default=None, description="Timber fabrication", examples=["LVL"]
+    )
+    weather_exposed: bool | None = pydantic.Field(
+        default=None,
+        description="Weather exposed",
+        examples=[True],
+    )
+    fire_retardant: bool | None = pydantic.Field(
+        default=None,
+        description="Fire retardant",
+        examples=[True],
+    )
+    decay_resistant: bool | None = pydantic.Field(
+        default=None,
+        description="Decay resistant",
+        examples=[True],
     )
-    fabrication: AllFabrication | None = pyd.Field(default=None, description="Timber fabrication", example="LVL")
-    weather_exposed: bool | None = pyd.Field(default=None, description="Weather exposed", example=True)
-    fire_retardant: bool | None = pyd.Field(default=None, description="Fire retardant", example=True)
-    decay_resistant: bool | None = pyd.Field(default=None, description="Decay resistant", example=True)
-    fsc_certified: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
-        default=None, description="Forest Stewardship Council certified proportion", example=0.3, ge=0, le=1
+    fsc_certified: Annotated[float | None, CodegenSpec(override_type=float)] = pydantic.Field(
+        default=None,
+        description="Forest Stewardship Council certified proportion",
+        examples=[0.3],
+        ge=0,
+        le=1,
     )
-    fsc_certified_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
-        default=None, description="", example=0.7
+    fsc_certified_z: Annotated[float | None, CodegenSpec(override_type=float)] = pydantic.Field(
+        default=None, description="", examples=[0.7]
     )
 
-    recycled_content: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
-        default=None, description="Recycled content", example=0.3, ge=0, le=1
+    recycled_content: Annotated[float | None, CodegenSpec(override_type=float)] = pydantic.Field(
+        default=None, description="Recycled content", examples=[0.3], ge=0, le=1
     )
-    recycled_content_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
-        default=None, description="", example=0.7
+    recycled_content_z: Annotated[float | None, CodegenSpec(override_type=float)] = pydantic.Field(
+        default=None, description="", examples=[0.7]
     )
 
     # Nested specs:

openepd/model/specs/singular/wood_joists.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 AllFabrication, AllTimberSpecies
 from openepd.model.specs.singular.common import HasForestPracticesCertifiers
@@ -30,8 +31,20 @@ class WoodJoistsV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     _EXT_VERSION = "1.0"
 
     # Own fields:
-    timber_species: AllTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
-    fabrication: AllFabrication | None = pyd.Field(default=None, description="", example="LVL")
-    weather_exposed: bool | None = pyd.Field(default=None, description="", example=True)
-    fire_retardant: bool | None = pyd.Field(default=None, description="", example=True)
-    decay_resistant: bool | None = pyd.Field(default=None, description="", example=True)
+    timber_species: AllTimberSpecies | None = pydantic.Field(default=None, description="", examples=["Alaska Cedar"])
+    fabrication: AllFabrication | None = pydantic.Field(default=None, description="", examples=["LVL"])
+    weather_exposed: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    fire_retardant: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )
+    decay_resistant: bool | None = pydantic.Field(
+        default=None,
+        description="",
+        examples=[True],
+    )

openepd/model/standard.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
 from openepd.model.validation.common import ReferenceStr
@@ -22,19 +23,25 @@ from openepd.model.validation.common import ReferenceStr
 class StandardRef(BaseOpenEpdSchema):
     """Reference version (short) of Standard."""
 
-    ref: ReferenceStr | None = pyd.Field(
+    ref: ReferenceStr | None = pydantic.Field(
         default=None,
-        example="https://openepd.buildingtransparency.org/api/standards/EN15804",
+        examples=["https://openepd.buildingtransparency.org/api/standards/EN15804"],
         description="Reference to this Standard's JSON object",
     )
-    short_name: str | None = pyd.Field(description="Short-form of name of standard.  Must be unique. Case-insensitive")
+    short_name: str | None = pydantic.Field(
+        description="Short-form of name of standard.  Must be unique. Case-insensitive"
+    )
 
 
 class Standard(StandardRef):
     """A standard, such as EN 15804, ISO 14044, ISO 14024:2018, etc."""
 
-    name: str | None = pyd.Field(description="Full document name.  Must be unique. Case-insensitive", default=None)
-    link: pyd.AnyUrl | None = pyd.Field(
-        description="Link to the exact standard (including version) referred to", default=None
+    name: str | None = pydantic.Field(
+        description="Full document name.  Must be unique. Case-insensitive",
+        default=None,
+    )
+    link: pydantic.AnyUrl | None = pydantic.Field(
+        description="Link to the exact standard (including version) referred to",
+        default=None,
     )
-    issuer: OrgRef | None = pyd.Field(description="Org that issued this standard", default=None)
+    issuer: OrgRef | None = pydantic.Field(description="Org that issued this standard", default=None)

openepd/model/validation/common.py

@@ -15,7 +15,8 @@
 #
 from typing import Annotated, Any, Callable, Type, TypeAlias
 
-from openepd.compat.pydantic import pyd
+import pydantic
+
 from openepd.model.versioning import Version
 
 
@@ -33,7 +34,9 @@ def validate_version_format(v: str) -> str:
     return v
 
 
-def validate_version_compatibility(class_version_attribute_name: str) -> Callable[[Type, str], str]:
+def validate_version_compatibility(
+    class_version_attribute_name: str,
+) -> Callable[[Type, str], str]:
     """Ensure that the object which is passed for parsing and validation is compatible with the class."""
 
     # we need closure to pass property name, since actual class will only be available in runtime
@@ -51,5 +54,8 @@ def validate_version_compatibility(class_version_attribute_name: str) -> Callabl
 
 ReferenceStr: TypeAlias = Annotated[
     str,
-    pyd.Field(description="Reference to another object", example="https://buildingtransparency.org/ec3/epds/1u7zsed8"),
+    pydantic.Field(
+        description="Reference to another object",
+        examples=["https://buildingtransparency.org/ec3/epds/1u7zsed8"],
+    ),
 ]

openepd/model/validation/numbers.py

@@ -13,16 +13,3 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-
-
-# todo when move to pydantic 2, these should change to Annotated[float, ...]
-class RatioFloat(float):
-    """Float representing a ratio (0-1)."""
-
-    pass
-
-
-class PositiveInt(int):
-    """Greater than zero integer."""
-
-    pass

openepd/model/validation/quantity.py

@@ -16,7 +16,10 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Callable, ClassVar
 
-from openepd.compat.pydantic import pyd
+import pydantic
+from pydantic import ConfigDict
+import pydantic_core
+
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Amount, OpenEPDUnit, RangeAmount
 
@@ -113,7 +116,9 @@ def validate_unit_factory(dimensionality: OpenEPDUnit | str) -> "QuantityValidat
     return validator
 
 
-def validate_quantity_unit_factory(dimensionality: OpenEPDUnit | str) -> "QuantityValidatorType":
+def validate_quantity_unit_factory(
+    dimensionality: OpenEPDUnit | str,
+) -> "QuantityValidatorType":
     """Create validator for quantity field to check unit matching."""
 
     def validator(cls: type | None, value: str) -> str:
@@ -162,18 +167,33 @@ class QuantityStr(str):
     unit: ClassVar[str]
 
     @classmethod
-    def __get_validators__(cls):
-        unit = getattr(cls, "unit", None)
-        if unit:
-            yield validate_quantity_unit_factory(cls.unit)
-            yield validate_quantity_ge_factory(f"0 {cls.unit}")
+    def _validate(cls, value: str) -> str:
+        value = validate_quantity_unit_factory(cls.unit)(cls, value)
+        value = validate_quantity_ge_factory(f"0 {cls.unit}")(cls, value)
+        return value
 
     @classmethod
-    def __modify_schema__(cls, field_schema):
-        field_schema.update(
-            example=f"1 {cls.unit}",
+    def __get_pydantic_core_schema__(
+        cls, source: type[Any], handler: pydantic.GetCoreSchemaHandler
+    ) -> pydantic_core.core_schema.CoreSchema:
+        return pydantic_core.core_schema.no_info_after_validator_function(
+            cls._validate,
+            pydantic_core.core_schema.str_schema(),
+            serialization=pydantic_core.core_schema.plain_serializer_function_ser_schema(
+                lambda x: x,
+                info_arg=False,
+                return_schema=pydantic_core.core_schema.str_schema(),
+            ),
         )
 
+    @classmethod
+    def __get_pydantic_json_schema__(cls, core_schema, handler):
+        schema = handler(core_schema)
+        schema.update(
+            examples=[f"1 {cls.unit}"],
+        )
+        return schema
+
 
 class PressureMPaStr(QuantityStr):
     """Pressure quantity type."""
@@ -205,10 +225,12 @@ class LengthMmStr(QuantityStr):
     unit = OpenEPDUnit.m
 
     @classmethod
-    def __modify_schema__(cls, field_schema):
-        field_schema.update(
-            example="6 mm",
+    def __get_pydantic_json_schema__(cls, core_schema, handler):
+        schema = handler(core_schema)
+        schema.update(
+            examples=["6 mm"],
         )
+        return schema
 
 
 class LengthInchStr(QuantityStr):
@@ -217,10 +239,12 @@ class LengthInchStr(QuantityStr):
     unit = "inch"
 
     @classmethod
-    def __modify_schema__(cls, field_schema):
-        field_schema.update(
-            example="2.5 inch",
+    def __get_pydantic_json_schema__(cls, core_schema, handler):
+        schema = handler(core_schema)
+        schema.update(
+            examples=["2.5 inch"],
         )
+        return schema
 
 
 class TemperatureCStr(QuantityStr):
@@ -356,26 +380,30 @@ class WithDimensionalityMixin(BaseOpenEpdSchema):
 
     # Unit for dimensionality to validate against, for example "kg"
 
-    @pyd.root_validator
+    @pydantic.model_validator(mode="before")
     def check_dimensionality_matches(cls, values: dict[str, Any]) -> dict[str, Any]:
         """Check that this amount conforms to the same dimensionality as dimensionality_unit."""
         if not cls.dimensionality_unit:
             return values
 
-        validate_unit_factory(cls.dimensionality_unit)(BaseOpenEpdSchema, values.get("unit"))  # type:ignore [arg-type]
+        validate_unit_factory(cls.dimensionality_unit)(BaseOpenEpdSchema, values.get("unit"))  # type: ignore[arg-type]
         return values
 
 
 class AmountRangeWithDimensionality(RangeAmount, WithDimensionalityMixin):
     """Mass amount, range."""
 
-    class Config:
-        """Pydantic config."""
-
-        @staticmethod
-        def schema_extra(schema: dict[str, Any], model: type["AmountRangeWithDimensionality"]) -> None:
-            """Modify json schema."""
-            schema["example"] = {"min": 1.2, "max": 3.4, "unit": str(model.dimensionality_unit) or None}
+    model_config = ConfigDict(
+        json_schema_extra=lambda schema, model: schema.update(
+            {
+                "example": {
+                    "min": 1.2,
+                    "max": 3.4,
+                    "unit": str(model.dimensionality_unit) or None,
+                }
+            }
+        )
+    )
 
 
 class WithMassKgMixin(WithDimensionalityMixin):

openepd/model/versioning.py

@@ -17,10 +17,10 @@ from abc import ABC
 from enum import ReprEnum
 from typing import ClassVar, NamedTuple
 
-from openepd.compat.pydantic import pyd
+import pydantic
 
 
-class WithExtVersionMixin(ABC, pyd.BaseModel):
+class WithExtVersionMixin(ABC, pydantic.BaseModel):
     """Mixin for extensions supporting versions: recommended way."""
 
     _EXT_VERSION: ClassVar[str]
@@ -30,10 +30,10 @@ class WithExtVersionMixin(ABC, pyd.BaseModel):
         """Set the default value for the ext_version field from _EXT_VERSION class var."""
         super().__init_subclass__()
         if hasattr(cls, "_EXT_VERSION"):
-            cls.__fields__["ext_version"].default = cls._EXT_VERSION
+            cls.model_fields["ext_version"].default = cls._EXT_VERSION
 
     # Note: default is set programmatically in __init_subclass__
-    ext_version: str | None = pyd.Field(description="Extension version", example="3.22", default=None)
+    ext_version: str | None = pydantic.Field(description="Extension version", examples=["3.22"], default=None)
 
 
 class Version(NamedTuple):
@@ -43,7 +43,7 @@ class Version(NamedTuple):
     minor: int
 
     @staticmethod
-    def parse_version(version: str) -> "Version":
+    def parse_version(version: str | None) -> "Version":
         """Parse the version of extension or the format.
 
         Version is expected to be major.minor
@@ -51,7 +51,10 @@ class Version(NamedTuple):
         :param version: The extension version.
         :return: A tuple of major and minor version numbers.
         """
-        splits = version.split(".", 1) if isinstance(version, str) else None
+        if isinstance(version, str):
+            splits = version.split(".", 1)
+        else:
+            splits = []
         if len(splits) != 2:
             raise ValueError(f"Invalid version: {version}")
         if not splits[0].isdigit() or not splits[1].isdigit():