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

openepd/model/validation/quantity.py

@@ -16,7 +16,11 @@
 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 typing_extensions import Self
+
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Amount, OpenEPDUnit, RangeAmount
 
@@ -113,7 +117,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,17 +168,32 @@ 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 __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 __modify_schema__(cls, field_schema):
-        field_schema.update(
-            example=f"1 {cls.unit}",
+    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):
@@ -205,10 +226,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 +240,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):
@@ -353,35 +378,43 @@ class WithDimensionalityMixin(BaseOpenEpdSchema):
     """Class for dimensionality-validated amounts."""
 
     dimensionality_unit: ClassVar[str | None] = None
+    unit: str | None
 
     # Unit for dimensionality to validate against, for example "kg"
 
-    @pyd.root_validator
-    def check_dimensionality_matches(cls, values: dict[str, Any]) -> dict[str, Any]:
+    @pydantic.model_validator(mode="after")
+    def check_dimensionality_matches(self) -> Self:
         """Check that this amount conforms to the same dimensionality as dimensionality_unit."""
-        if not cls.dimensionality_unit:
-            return values
+        if not self.dimensionality_unit:
+            return self
+
+        if self.unit is None:
+            raise ValueError("`unit` is required for dimensionality-validated amounts")
 
-        validate_unit_factory(cls.dimensionality_unit)(BaseOpenEpdSchema, values.get("unit"))  # type:ignore [arg-type]
-        return values
+        validate_unit_factory(self.dimensionality_unit)(BaseOpenEpdSchema, self.unit)
+        return self
 
 
 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):
     """Unit validation mixin."""
 
-    dimensionality_unit = MassKgStr.unit
+    dimensionality_unit: ClassVar[str | None] = MassKgStr.unit
 
 
 class AmountMass(Amount, WithMassKgMixin):
@@ -399,7 +432,7 @@ class AmountRangeMass(AmountRangeWithDimensionality, WithMassKgMixin):
 class WithGwpMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = GwpKgCo2eStr.unit
+    dimensionality_unit: ClassVar[str | None] = GwpKgCo2eStr.unit
 
 
 class AmountGWP(Amount, WithGwpMixin):
@@ -435,7 +468,7 @@ class AmountLengthM(Amount, WithLengthMMixin):
 class WithLengthMmMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = LengthMmStr.unit
+    dimensionality_unit: ClassVar[str | None] = LengthMmStr.unit
 
 
 class AmountLengthMm(Amount, WithLengthMMixin):
@@ -453,7 +486,7 @@ class AmountRangeLengthMm(AmountRangeWithDimensionality, WithLengthMmMixin):
 class WithPressureMpaMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = PressureMPaStr.unit
+    dimensionality_unit: ClassVar[str | None] = PressureMPaStr.unit
 
 
 class AmountPressureMpa(Amount, WithPressureMpaMixin):
@@ -471,7 +504,7 @@ class AmountRangePressureMpa(AmountRangeWithDimensionality, WithPressureMpaMixin
 class WithAreaM2Mixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = AreaM2Str.unit
+    dimensionality_unit: ClassVar[str | None] = AreaM2Str.unit
 
 
 class AmountAreaM2(Amount, WithAreaM2Mixin):
@@ -489,7 +522,7 @@ class AmountRangeAreaM2(AmountRangeWithDimensionality, WithAreaM2Mixin):
 class WithLengthInchStr(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = LengthInchStr.unit
+    dimensionality_unit: ClassVar[str | None] = LengthInchStr.unit
 
 
 class AmountLengthInch(Amount, WithLengthInchStr):
@@ -507,7 +540,7 @@ class AmountRangeLengthInch(AmountRangeWithDimensionality, WithLengthInchStr):
 class WithTemperatureCMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = TemperatureCStr.unit
+    dimensionality_unit: ClassVar[str | None] = TemperatureCStr.unit
 
 
 class AmountTemperatureC(Amount, WithTemperatureCMixin):
@@ -525,7 +558,7 @@ class AmountRangeTemperatureC(AmountRangeWithDimensionality, WithTemperatureCMix
 class WithCapacityPerHourMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = CapacityPerHourStr.unit
+    dimensionality_unit: ClassVar[str | None] = CapacityPerHourStr.unit
 
 
 class AmountCapacityPerHour(Amount, WithCapacityPerHourMixin):
@@ -543,7 +576,7 @@ class AmountRangeCapacityPerHour(AmountRangeWithDimensionality, WithCapacityPerH
 class WithRValueMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = RValueStr.unit
+    dimensionality_unit: ClassVar[str | None] = RValueStr.unit
 
 
 class AmountRValue(Amount, WithRValueMixin):
@@ -561,7 +594,7 @@ class AmountRangeRValue(AmountRangeWithDimensionality, WithRValueMixin):
 class WithSpeedMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = SpeedStr.unit
+    dimensionality_unit: ClassVar[str | None] = SpeedStr.unit
 
 
 class AmountSpeed(Amount, WithSpeedMixin):
@@ -579,7 +612,7 @@ class AmountRangeSpeed(AmountRangeWithDimensionality, WithSpeedMixin):
 class WithColorTemperatureMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = ColorTemperatureStr.unit
+    dimensionality_unit: ClassVar[str | None] = ColorTemperatureStr.unit
 
 
 class AmountColorTemperature(Amount, WithColorTemperatureMixin):
@@ -597,7 +630,7 @@ class AmountRangeColorTemperature(AmountRangeWithDimensionality, WithColorTemper
 class WithLuminosityMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = LuminosityStr.unit
+    dimensionality_unit: ClassVar[str | None] = LuminosityStr.unit
 
 
 class AmountLuminosity(Amount, WithLuminosityMixin):
@@ -615,7 +648,7 @@ class AmountRangeLuminosity(AmountRangeWithDimensionality, WithLuminosityMixin):
 class WithPowerMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = PowerStr.unit
+    dimensionality_unit: ClassVar[str | None] = PowerStr.unit
 
 
 class AmountPower(Amount, WithPowerMixin):
@@ -633,7 +666,7 @@ class AmountRangePower(AmountRangeWithDimensionality, WithPowerMixin):
 class WithElectricalCurrentMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = ElectricalCurrentStr.unit
+    dimensionality_unit: ClassVar[str | None] = ElectricalCurrentStr.unit
 
 
 class AmountElectricalCurrent(Amount, WithElectricalCurrentMixin):
@@ -651,7 +684,7 @@ class AmountRangeElectricalCurrent(AmountRangeWithDimensionality, WithElectrical
 class WithVolumeMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = VolumeStr.unit
+    dimensionality_unit: ClassVar[str | None] = VolumeStr.unit
 
 
 class AmountVolume(Amount, WithVolumeMixin):
@@ -669,7 +702,7 @@ class AmountRangeVolume(AmountRangeWithDimensionality, WithVolumeMixin):
 class WithAirflowMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = AirflowStr.unit
+    dimensionality_unit: ClassVar[str | None] = AirflowStr.unit
 
 
 class AmountAirflow(Amount, WithAirflowMixin):
@@ -687,7 +720,7 @@ class AmountRangeAirflow(AmountRangeWithDimensionality, WithAirflowMixin):
 class WithFlowRateMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = FlowRateStr.unit
+    dimensionality_unit: ClassVar[str | None] = FlowRateStr.unit
 
 
 class AmountFlowRate(Amount, WithFlowRateMixin):
@@ -705,7 +738,7 @@ class AmountRangeFlowRate(AmountRangeWithDimensionality, WithFlowRateMixin):
 class WithMassPerLengthMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = MassPerLengthStr.unit
+    dimensionality_unit: ClassVar[str | None] = MassPerLengthStr.unit
 
 
 class AmountMassPerLength(Amount, WithFlowRateMixin):
@@ -723,7 +756,7 @@ class AmountRangeMassPerLength(AmountRangeWithDimensionality, WithFlowRateMixin)
 class WithAreaPerVolumeMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = AreaPerVolumeStr.unit
+    dimensionality_unit: ClassVar[str | None] = AreaPerVolumeStr.unit
 
 
 class AmountAreaPerVolume(Amount, WithFlowRateMixin):
@@ -741,7 +774,7 @@ class AmountRangeAreaPerVolume(AmountRangeWithDimensionality, WithFlowRateMixin)
 class WithThermalConductivity(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = ThermalConductivityStr.unit
+    dimensionality_unit: ClassVar[str | None] = ThermalConductivityStr.unit
 
 
 class AmountThermalConductivityMixin(Amount, WithThermalConductivity):
@@ -763,7 +796,7 @@ class WithForce(WithDimensionalityMixin):
     May the Force be with you.
     """
 
-    dimensionality_unit = ForceNStr.unit
+    dimensionality_unit: ClassVar[str | None] = ForceNStr.unit
 
 
 class AmountForce(Amount, WithForce):
@@ -781,7 +814,7 @@ class AmountRangeForce(AmountRangeWithDimensionality, WithForce):
 class WithYarnWeight(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = YarnWeightStr.unit
+    dimensionality_unit: ClassVar[str | None] = YarnWeightStr.unit
 
 
 class AmountYarnWeight(Amount, WithYarnWeight):
@@ -799,7 +832,7 @@ class AmountRangeYarnWeight(AmountRangeWithDimensionality, WithYarnWeight):
 class WithThermalExpansion(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = ThermalExpansionStr.unit
+    dimensionality_unit: ClassVar[str | None] = ThermalExpansionStr.unit
 
 
 class AmountThermalExpansion(Amount, WithThermalExpansion):
@@ -817,7 +850,7 @@ class AmountRangeThermalExpansion(AmountRangeWithDimensionality, WithThermalExpa
 class WithUtilization(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = UtilizationStr.unit
+    dimensionality_unit: ClassVar[str | None] = UtilizationStr.unit
 
 
 class AmountUtilization(Amount, WithUtilization):
@@ -835,7 +868,7 @@ class AmountRangeUtilization(AmountRangeWithDimensionality, WithUtilization):
 class WithUFactor(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = UFactorStr.unit
+    dimensionality_unit: ClassVar[str | None] = UFactorStr.unit
 
 
 class AmountUFactor(Amount, WithUFactor):
@@ -853,7 +886,7 @@ class AmountRangeUFactor(AmountRangeWithDimensionality, WithUFactor):
 class WithRFactor(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = RFactorStr.unit
+    dimensionality_unit: ClassVar[str | None] = RFactorStr.unit
 
 
 class AmountRFactor(Amount, WithRFactor):

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():

{openepd-6.13.2.dist-info → openepd-7.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.13.2
+Version: 7.0.1
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -21,7 +21,7 @@ Requires-Dist: email-validator (>=1.3.1)
 Requires-Dist: idna (>=3.7)
 Requires-Dist: open-xpd-uuid (>=0.2.1,<0.3.0)
 Requires-Dist: openlocationcode (>=1.0.1)
-Requires-Dist: pydantic (>=1.10,<3.0)
+Requires-Dist: pydantic (>=2.0,<3)
 Requires-Dist: requests (>=2.0) ; extra == "api-client"
 Project-URL: Repository, https://github.com/cchangelabs/openepd
 Description-Content-Type: text/markdown

openepd-7.0.1.dist-info/RECORD

@@ -0,0 +1,141 @@
+openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/__version__.py,sha256=cQ-OwE-r-8WgC7M8aP58dwhTkUGGnep-uii5xipUfHI,638
+openepd/api/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/average_dataset/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=SRIs-qmb_wO7ELumeP1DLXJbVUtdBJ4CToecoCIsPAQ,8015
+openepd/api/average_dataset/industry_epd_sync_api.py,sha256=b3oBjt-HIZuuHd6qDTJgHAIBHV73FCIZSc8cLq-htXE,6338
+openepd/api/base_sync_client.py,sha256=lVOn8d_EM6-Vwn99poRt1IEyLmDwatXDOH1D68F0LQ8,21739
+openepd/api/category/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/category/dto.py,sha256=-nsSNH1zWIluFuF50qmnIcvloX08Jk_KV5mebJqzLe4,850
+openepd/api/category/sync_api.py,sha256=XU68fMQXSsfwfKkZvAlvBS78Z5hNwpXbO_Ffsh7LP0U,1381
+openepd/api/common.py,sha256=bLSER3RQQFR4lyEuxQPKNjTaa3S0K8fFi8x4QRAPM_g,8812
+openepd/api/dto/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/dto/base.py,sha256=hZbzzBDPEN5-5Hhfcy7FgZj_Ya3g9oS7CgaQYhQiRwU,1041
+openepd/api/dto/common.py,sha256=qwZaquepK1vQrOHVSzP5hMVy8klwrfqmpTSfrJ-YBs0,4489
+openepd/api/dto/meta.py,sha256=0x_rAx4ijO4l0C9C3jSu4sfX7lNctqCAUd51WUkoY3s,2276
+openepd/api/dto/mf.py,sha256=3pobE0iihSBqH0rZgWP95_IlQzSJBqKZrYYufWDobUo,2000
+openepd/api/dto/params.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/epd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/epd/dto.py,sha256=rcRUKUj-N885K6tjQnPGiFVDhc8yd9nUJKnkhIwgOtM,5084
+openepd/api/epd/sync_api.py,sha256=QN62LQH3sHLvCqCVo2MGgN9ZvoTxIsdleEypyW3m-zA,7365
+openepd/api/errors.py,sha256=BgZeNfMNAKVPfhpuiVapCXNBSsXygAOWql-gy7m9j7E,2868
+openepd/api/pcr/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/pcr/sync_api.py,sha256=bWa6PyU0xT1sZzG4nAHUo83gjo3YcP5QUxVXOMFNQH0,1567
+openepd/api/sync_client.py,sha256=reD_OXsaVOvUvnC-cyp5aq8sKSOH2Z8xmImxV2ClQIM,3105
+openepd/api/test/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/api/utils.py,sha256=xOU8ihC0eghsoaCFhC85PU4WYRwNxVEpfK3gzq4e9ik,2092
+openepd/bundle/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/bundle/base.py,sha256=Ou2zlAV7VRKp7Lxu8h4k56OLEMwn5F1nrEEF_ies_lE,6869
+openepd/bundle/model.py,sha256=bO6GAN_hMmpnYn9LQAHl6bw9cqwphlZZtMCkQZHzP8c,2627
+openepd/bundle/reader.py,sha256=_kKOCcCtHF-DuezifsArvyUzDMAK2vs4pJB6cNttTeA,6801
+openepd/bundle/writer.py,sha256=ZWQKVRfd0wrys1R4rOabK8KFvwNhUpeBdK9KGS-yt5Q,8283
+openepd/m49/__init__.py,sha256=vkXC6i8OeCl5K88JUIRN_NKfsAIpNIaN-fyPmmd-Lfk,689
+openepd/m49/const.py,sha256=buspTHOOWhkBXWUIS0oqvQ0y1L7y70Y_PXilkiBIKD4,31819
+openepd/m49/utils.py,sha256=Qm8HvxAZlQncsyUYDO0lG0feMFFnT4HQPNSMp78W4zU,7111
+openepd/model/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/model/base.py,sha256=zSV_tgZZsd2x0jgmwfrrncGDTr0QINTDkPJDubk-W7Q,10811
+openepd/model/category.py,sha256=iyzzAsiVwW4zJ61oYsm9Sy-sEBA71-aMFXcJP1Y-dPI,1734
+openepd/model/common.py,sha256=TxcLcYDgAgHtS-go8xYzPYnWTHLuE8bUebiVrXMXf5M,14544
+openepd/model/declaration.py,sha256=1NT3NhaYI_5u1K9ErfphOSFMY6r1-97qpBYNxuCmbs0,14687
+openepd/model/epd.py,sha256=KACR_2tbbk0eltaL37MvDxqdJUDWXtiqYGW0_bWl7v4,12730
+openepd/model/factory.py,sha256=doexyqZXJVGd45T1JsbjuyGUjEykW-MerKUq4SQHhRY,2656
+openepd/model/generic_estimate.py,sha256=RGNrGNwaqY42m6nRrwmDZYO_Gy2EhOBZn6g0EAWiDHs,4224
+openepd/model/geography.py,sha256=Jx7NIDdk_sIvwyh-7YxnIjAwIHW2HCQK7UtFGM2xKtw,42095
+openepd/model/industry_epd.py,sha256=Cqn01IUNSZqRkyU05TwtOLXDKlg0YnGzqvKL8A__zbI,4061
+openepd/model/lcia.py,sha256=wilehrZfb5d_kqOuaVVk_TuFRDLr2jagScAXsXArZsI,27186
+openepd/model/org.py,sha256=1ALm91OyJrvyFjkJ1hWQWGKO5fDdYQE8lMWEVZRUPrs,6348
+openepd/model/pcr.py,sha256=W_GjmMwFxZGLnbbU7khoYziSvOxxd6Id4xBdhitq_SE,5655
+openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
+openepd/model/specs/__init__.py,sha256=YcAvn0h_Bhz_Cb4-uEl8DiBI82nXogQsocB-c2zvr_A,3094
+openepd/model/specs/asphalt.py,sha256=6jAZEBkB4hpwcSDvwVUGiNXgg3W3NElgdhS9caVpocI,3545
+openepd/model/specs/base.py,sha256=X_1TiMmTSSoOtZlbRl0jqzo1agX_QivQL4gToGNQeRY,2757
+openepd/model/specs/concrete.py,sha256=gjly5f7QEuaKnYZStMm0CisU0Us1PUa2HmxPyhhmuO0,5573
+openepd/model/specs/enums.py,sha256=_WMe0l8ZKPIGQG53A1rB_Sv_p2izr8Zemg9AEEYOU2g,63638
+openepd/model/specs/range/__init__.py,sha256=ZXgsyzn_c6H2SPCo5hTVZOjRqlCf0HvVVMDQ4RGaPSU,4502
+openepd/model/specs/range/accessories.py,sha256=wnOv1V_uatA6g_9QVfZaSp-rNLbyZ_KS-t3wlHaeEsI,2498
+openepd/model/specs/range/aggregates.py,sha256=wnGI6AxtQaaYgCGvqYUuM94JVOBipCBRvFLTwpflsyA,2555
+openepd/model/specs/range/aluminium.py,sha256=U58Sg6TJi0CfqOtoiNT4M8uwx9H2jlTPxmMWCt-JKHc,2741
+openepd/model/specs/range/asphalt.py,sha256=qd7oGvsIztz2WRMlCfTVqQfRUYBDA-1qzQTiF7tD2O8,3002
+openepd/model/specs/range/bulk_materials.py,sha256=SuKhmJXMa9jl0CrkYr3QVvPX_GDbr7KATzrSS-fJEU4,1051
+openepd/model/specs/range/cast_decks_and_underlayment.py,sha256=37fx7jDRy6xryZTVweW_vu78h0kRs5vQurGS-Ypayog,1132
+openepd/model/specs/range/cladding.py,sha256=-cBYQrABiTbByl-ZioHKBmTL2h-SjukeSJdNTLY7FgQ,7277
+openepd/model/specs/range/cmu.py,sha256=Syfk4gJzWNzBQcKsPKgVcQQutR2syruM1ZJUJ1FdCdU,1879
+openepd/model/specs/range/concrete.py,sha256=BIeM1ozlfjLqohMTfdFPxmk6cIKg19MwYXyVhoHL1i8,7064
+openepd/model/specs/range/conveying_equipment.py,sha256=AvSg6PqK-GcFt-aUCTsaBhjPyEjGfVPu61QiHscQt1M,3216
+openepd/model/specs/range/electrical.py,sha256=jebPfOwDCzUS5ppCXbZBcgQLtMNYl__f5P0hGOfiE10,11945
+openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,sha256=rbdmHvz9nRMgcWrCGVnN0xXSl5ZezuwArOZ_4xCQIgM,2525
+openepd/model/specs/range/electricity.py,sha256=yn_S25C_tZqseb8hiJ1yiHszu2mQ49FOFWWCqNpOBY0,997
+openepd/model/specs/range/finishes.py,sha256=gJnMvjhivQC0jnKizKcrwn1Y7UJjrK_emixigQhbbfE,21792
+openepd/model/specs/range/fire_and_smoke_protection.py,sha256=KLH5t3d-a2cppF5i-uW4233z1vAPbJIY1zTn89_gV4k,3333
+openepd/model/specs/range/furnishings.py,sha256=SPZDMacVvXHA_zcE4l3fL5hroZWaEeSsql0oSn3BnBo,6576
+openepd/model/specs/range/grouting.py,sha256=BQPxH6BvlXpdhLEZBui9zTuY93K_9syjoa6rdnF8GGY,1095
+openepd/model/specs/range/manufacturing_inputs.py,sha256=iqK4QS-T5vyjMQtl5v63Feb99qSNwKS0kM-1izoJTzA,5615
+openepd/model/specs/range/masonry.py,sha256=egeqDr0K3eTFDHeIzFHrg9_u9d6XIHOSmBPnBERkvxY,2908
+openepd/model/specs/range/material_handling.py,sha256=9jxRHpjMKu71B5omH55UjkNVJvaTLgTMtEidSKPFn5c,1483
+openepd/model/specs/range/mechanical.py,sha256=4_onG6dMjYDvpFe7NmF_gPFwI0N52CAZty4YwDUqx4E,10463
+openepd/model/specs/range/mechanical_insulation.py,sha256=eBvNMuW-zZyphay9aKOphwfAv2Uo3AiBR1UG9sOwBnk,1733
+openepd/model/specs/range/network_infrastructure.py,sha256=WPudKji72n46SXDGCEV9PMWD-zheZd7rvBJv3cZ0L3E,8738
+openepd/model/specs/range/openings.py,sha256=icQFUQLwhoWc5GFrnxUJuQ6pxUzSxTWMdQHyQ342TUM,15587
+openepd/model/specs/range/other_electrical_equipment.py,sha256=H4tZHcHyR2uUYHn-bQfLC6hR4tynVp_7EJbiI-YpK7Y,1001
+openepd/model/specs/range/other_materials.py,sha256=k7Gv6YvWy43B-QFBabBt-TkvkC450Pz2a2pz9t6r4OU,4495
+openepd/model/specs/range/plumbing.py,sha256=GS-q4nMOaE1aoPwHmDXEjlG7xuZOl0veovZraSSQcc4,5382
+openepd/model/specs/range/precast_concrete.py,sha256=9bNluxpGuQ_7HqA5rpvg9FJHeMyrGSIH-c1M9Mzz2qQ,3820
+openepd/model/specs/range/sheathing.py,sha256=FOosFJ8fsyqQnlLTgEqxM4xzDtiYP2jQ7dCf2T4K1O4,3446
+openepd/model/specs/range/steel.py,sha256=T4vk8g9X2PUbkm8pfjAvcZ7Y0iN7ErpNZapp89l0lIg,10547
+openepd/model/specs/range/thermal_moisture_protection.py,sha256=BOZZTNA9mHTaImN4J484LYnYTvv3joBX5OkH6LGBklc,9470
+openepd/model/specs/range/utility_piping.py,sha256=doRcQRfBWvHX7FDDYk-bEU5rVCS_vjZ_5gKslI0xR7Y,2671
+openepd/model/specs/range/wood.py,sha256=0Prq5n3n_-DEFe4-fBKDj9zCu2NdBD7ysCun7DRhT_o,6942
+openepd/model/specs/range/wood_joists.py,sha256=PVGJZPdaI685rUI6TS3MZrAFkeMckFGpCYTNJLBr6IM,1786
+openepd/model/specs/singular/__init__.py,sha256=xN6exBUHRoaM-30YfLPfB4UrLLcQo55MOfK70Dg5KIQ,6945
+openepd/model/specs/singular/accessories.py,sha256=xcuSJrG84oTm_w76_wlv_sItfK36gSyDmUD2TnpZnVE,2013
+openepd/model/specs/singular/aggregates.py,sha256=n_AbZK6TJHJ6boyMz6AyikUkMiNlq8G_NOcqEy_A-Sg,2975
+openepd/model/specs/singular/aluminium.py,sha256=n25EvcrwYNkz4OvZbu4FH008owSkC8B8j7qEHGefTD0,2519
+openepd/model/specs/singular/asphalt.py,sha256=pVOBCaceMKR6eKztVZ-fRk1bgoY0X8QfBr_KCkgvZyM,3488
+openepd/model/specs/singular/bulk_materials.py,sha256=LKTmh432ak51L0GsVf-40389Lwx-sxZm_jSfzWNfagE,875
+openepd/model/specs/singular/cast_decks_and_underlayment.py,sha256=HjIEKekxCAKx51XEvH1tthUP6gNTbntDoi8gSu8LjZk,955
+openepd/model/specs/singular/cladding.py,sha256=KuKNcmkZSKTMVMsNIHQIZ3qkj21_vj_6I7cIladPmo4,6857
+openepd/model/specs/singular/cmu.py,sha256=J5BqQZyoZA6tGVBxg77jaeFOXLNvLwDmA0qAe8wHgJs,2100
+openepd/model/specs/singular/common.py,sha256=1WSoihRTeOkdcOPSmcauzyHNyAVspiacAU5lQX9vahk,1030
+openepd/model/specs/singular/concrete.py,sha256=w7_fvJri1bY1f1sEe6kuxvbjg2iiwDPTh-6Kx5CzHCY,8257
+openepd/model/specs/singular/conveying_equipment.py,sha256=Hcy1zcXKsGIuh303xiRJwDmnEOqyGzhsZoVEz3DpdHY,3203
+openepd/model/specs/singular/deprecated/__init__.py,sha256=OmC79bG2zbDcaPZAjSx5T506h2D7QJXMJOkXSSf8LVo,2617
+openepd/model/specs/singular/deprecated/concrete.py,sha256=xqHxwFUzy0XEa66e1N1Z3aKt6hhnHhbJ76XiRoe0wtQ,5604
+openepd/model/specs/singular/deprecated/steel.py,sha256=xqp6rqA49ARY7uvObvnNh-y9cN0WCy0Qz3sMuuIBXPY,3647
+openepd/model/specs/singular/electrical.py,sha256=lLp8MjAULlnfINi7AayexTGDorSEH_r9OONFcxVHcs4,11598
+openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.py,sha256=oZYyHgnXn9RH3YzltUEDiiQKrin2mvMlTgC3OhxV7DY,1978
+openepd/model/specs/singular/electricity.py,sha256=f1cJ9eklNUf97khCIZiT5-z8V_TbOcvH2me_1UTQVrE,823
+openepd/model/specs/singular/finishes.py,sha256=8BtFK2_olB8OJQFv8rxf7afoLhqlJI1o2tEKopidOGA,24398
+openepd/model/specs/singular/fire_and_smoke_protection.py,sha256=h8Dy4ps_xfa5g8EQEIN8OHxjH6aDvqmZUFRdEzYy7aY,3081
+openepd/model/specs/singular/furnishings.py,sha256=6MZT42b-nlZdQvvZw1_tVg5GFlMQ2gw_r6zBjxMtxHc,5608
+openepd/model/specs/singular/grouting.py,sha256=pg2tX3W7a2TQ3z_eyFYGlBJY3WEwn6JlZyqM3PQIJcU,934
+openepd/model/specs/singular/manufacturing_inputs.py,sha256=OBy7Lzm1TbC8kGxE3YXIXeyrqIPqf2_rXcGEN7MEMBw,5233
+openepd/model/specs/singular/masonry.py,sha256=e9siblrPFFSvIjucYkwZzSlpSSZPZ9rA1bdVIDQz-RM,3627
+openepd/model/specs/singular/material_handling.py,sha256=iEeUx1hNKla669y0zl-QAJn6xA7ceq75aRG8qT0p56Q,1274
+openepd/model/specs/singular/mechanical.py,sha256=q-89Ch0uTlEqFRXM5QPgkmf23L-xyCzVK_mQ33pU4UA,10191
+openepd/model/specs/singular/mechanical_insulation.py,sha256=OjgDkH9ft2mxsfYveuwozCT6x-WrF_XC9V9KbEYKwuQ,1616
+openepd/model/specs/singular/mixins/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/model/specs/singular/mixins/conduit_mixin.py,sha256=H5rbXIy3lpiU_Rub3_f7cECtQE2odu1-nIKuRjtO6ts,1959
+openepd/model/specs/singular/network_infrastructure.py,sha256=QGMIFzexHH94phkFw7iYl-fTZ_514dwYgvC-2sHjOZw,9316
+openepd/model/specs/singular/openings.py,sha256=fcYBvSJW64fBArvs0ajcRXRegE07p-YmURICmLA8ilY,19544
+openepd/model/specs/singular/other_electrical_equipment.py,sha256=FX7p4rMuUbTrz1yDwKkS-Z6odohoq-zCw6SU3Kw5ISs,814
+openepd/model/specs/singular/other_materials.py,sha256=_00_fCPn7G_-HVKC1cQcNvBDf4CtXFLOGvYLDJtL5ZA,3498
+openepd/model/specs/singular/plumbing.py,sha256=dP6r7xy2yeP8ICEBN79CfJqyDiuwpTtDnURBfWmFWPs,4639
+openepd/model/specs/singular/precast_concrete.py,sha256=25vn5UxiQbhsNisqBF9_GYASMl3D1iuDWxfnV5HOV4k,7567
+openepd/model/specs/singular/sheathing.py,sha256=J1lHRo0eTcWGhqwLHGnEZq3SHJkVCvSedvg2lGuwDyo,3995
+openepd/model/specs/singular/steel.py,sha256=rrWAyz6w5bgV2lR6H93dLZ_ruwr8N67vATh9nIHS6eU,10809
+openepd/model/specs/singular/thermal_moisture_protection.py,sha256=ZtN1yfED959eMqpdLASge06OZzCseurtPzXrmi8LSjo,8363
+openepd/model/specs/singular/utility_piping.py,sha256=kHflrQpCFGW54daIWwbhb0rvWoPy1Zwa6KGD8eB5ryQ,2522
+openepd/model/specs/singular/wood.py,sha256=ChvILu6Pkend3O-45Fs-FrK0n5yWlu5BFZVYrCv5_TQ,6810
+openepd/model/specs/singular/wood_joists.py,sha256=WhS8_Og8e4cCEd43v00njGNvjLdfCwAabO7XOogC5o4,1829
+openepd/model/standard.py,sha256=5y57ZakJ9nbvz1Hxx8Uo6jISNMGg9kg2kBeBZrjBB5g,1744
+openepd/model/validation/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/model/validation/common.py,sha256=ZlpByfGzCHZuGfj9p0S_uG8NoGy9ezJVZmwAITp7gR8,2450
+openepd/model/validation/enum.py,sha256=ttODVtMEQaBemMFywGUNlXU4bAM25FiBlVDKZbOv2iY,1793
+openepd/model/validation/numbers.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/model/validation/quantity.py,sha256=zsyNGygYW4GGeWAtyM9708lFdEuebtSctr3qIfNdEXQ,21720
+openepd/model/versioning.py,sha256=de53OlduidxAkDlSbAu6xrIy2IUuCnwI69vUJPCXX_8,4512
+openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openepd-7.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.0.1.dist-info/METADATA,sha256=nqzPdeu5vJAB7DTCYDXRVx2ebuPlRn4YI9-lcpbzrdg,9035
+openepd-7.0.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-7.0.1.dist-info/RECORD,,

openepd/compat/__init__.py

@@ -1,15 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#

openepd/compat/compat_functional_validators.py

@@ -1,25 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-from typing import Any
-
-__all__ = ["AfterValidator"]
-
-
-class AfterValidator:
-    """Placeholder stub for validator, unused in pydantic 1."""
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        pass

openepd/compat/pydantic.py

@@ -1,30 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-try:
-    from pydantic import functional_validators  # type: ignore
-    from pydantic import v1 as pyd  # type: ignore
-    from pydantic.v1 import generics as pyd_generics  # type: ignore
-
-except ImportError:
-    import pydantic as pyd  # type: ignore[no-redef]
-    from pydantic import generics as pyd_generics  # type: ignore[no-redef]
-
-    from . import compat_functional_validators as functional_validators  # type: ignore[no-redef]
-
-
-pydantic = pyd
-
-__all__ = ["pyd", "pydantic", "pyd_generics", "functional_validators"]