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

openepd/__init__.py

@@ -13,9 +13,3 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import os
-
-# from .patch_pydantic import patch_pydantic
-#
-# if os.environ.get("OPENEPD_DISABLE_PYDANTIC_PATCH", "false").lower() not in ("true", "1", "yes"):
-#     patch_pydantic()

openepd/__version__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-VERSION = "7.0.0"
+VERSION = "7.1.0"

openepd/api/category/sync_api.py

@@ -28,7 +28,7 @@ class CategoryApi(BaseApiMethodGroup):
         :return: categories tree wrapped in OpenEpdApiResponse
         """
         response = self._client.do_request("get", "/v2/categories/tree")
-        return CategoryTreeResponse.model_validate(response.content)
+        return CategoryTreeResponse.model_validate_json(response.content)
 
     def get_tree(self) -> Category:
         """

openepd/model/base.py

@@ -234,7 +234,7 @@ class BaseDocumentFactory(Generic[TRootDocument]):
         for x, doc_cls in cls.VERSION_MAP.items():
             if x.major == version.major:
                 if version.minor <= x.minor:
-                    return doc_cls(**data)
+                    return doc_cls.model_validate(data)
                 else:
                     raise ValueError(
                         f"Unsupported version: {version}. The highest supported version from branch {x.major}.x is {x}"

openepd/model/common.py

@@ -14,7 +14,7 @@
 #  limitations under the License.
 #
 from enum import StrEnum
-from typing import Annotated, Any
+from typing import Annotated, Any, Self
 
 import pydantic
 import pydantic_core
@@ -32,12 +32,15 @@ class Amount(BaseOpenEpdSchema):
         default=None,
     )
 
-    @pydantic.model_validator(mode="before")
-    def check_qty_or_unit(cls, values: dict[str, Any]):
+    model_config = pydantic.ConfigDict(from_attributes=True)
+
+    @pydantic.model_validator(mode="after")
+    def check_qty_or_unit(self) -> Self:
         """Ensure that qty or unit is provided."""
-        if values.get("qty") is None and values.get("unit") is None:
+
+        if self.qty is None and self.unit is None:
             raise ValueError("Either qty or unit must be provided.")
-        return values
+        return self
 
     def to_quantity_str(self):
         """Return a string representation of the amount."""

openepd/model/epd.py

@@ -282,10 +282,10 @@ class EpdWithDepsV0(EpdV0, title="EPD (with Dependencies)"):
     some required fields in Org (like web_domain), and WithDeps would not.
     """
 
-    manufacturer: Org | None = pydantic.Field(description=MANUFACTURER_DESCRIPTION)
-    epd_developer: Org | None = pydantic.Field(description=DEVELOPER_DESCRIPTION, default=None)
-    program_operator: Org | None = pydantic.Field(description=PROGRAM_OPERATOR_DESCRIPTION)
-    third_party_verifier: Org | None = pydantic.Field(description=THIRD_PARTY_VERIFIER_DESCRIPTION)
+    manufacturer: Org | None = pydantic.Field(description=MANUFACTURER_DESCRIPTION, default=None)  # type: ignore[assignment]
+    epd_developer: Org | None = pydantic.Field(description=DEVELOPER_DESCRIPTION, default=None)  # type: ignore[assignment]
+    program_operator: Org | None = pydantic.Field(description=PROGRAM_OPERATOR_DESCRIPTION, default=None)  # type: ignore[assignment]
+    third_party_verifier: Org | None = pydantic.Field(description=THIRD_PARTY_VERIFIER_DESCRIPTION, default=None)  # type: ignore[assignment]
 
 
 EpdWithDeps = EpdWithDepsV0

openepd/model/generic_estimate.py

@@ -110,8 +110,8 @@ class GenericEstimateWithDepsV0(GenericEstimateV0, title="Generic Estimate (with
     Contains related entities - orgs - with full fields, to support object matching in implementations.
     """
 
-    publisher: Org | None = pydantic.Field(description="Organization that published the LCA results.")
-    reviewer: Org | None = pydantic.Field(description="Org that performed a critical review of the LCA.")
+    publisher: Org | None = pydantic.Field(description="Organization that published the LCA results.", default=None)  # type: ignore[assignment]
+    reviewer: Org | None = pydantic.Field(description="Org that performed a critical review of the LCA.", default=None)  # type: ignore[assignment]
 
 
 GenericEstimateWithDeps = GenericEstimateWithDepsV0

openepd/model/lcia.py

@@ -18,6 +18,7 @@ from typing import Any, ClassVar
 
 import pydantic
 from pydantic import ConfigDict
+from typing_extensions import Self
 
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Measurement
@@ -200,15 +201,18 @@ class ScopeSet(BaseOpenEpdSchema):
         description="Potential net benefits from reuse, recycling, and/or energy recovery beyond the system boundary.",
     )
 
-    @pydantic.model_validator(mode="before")
-    def _unit_validator(cls, values: dict[str, Any]) -> dict[str, Any]:
+    model_config = pydantic.ConfigDict(from_attributes=True)
+
+    @pydantic.model_validator(mode="after")
+    def _unit_validator(self) -> Self:
         all_units = set()
 
-        for k, v in values.items():
+        for k in self.model_fields:
+            v = getattr(self, k, None)
             if isinstance(v, Measurement):
                 all_units.add(v.unit)
 
-        if not cls.allowed_units:
+        if not self.allowed_units:
             # For unknown units - only units should be the same across all measurements (textually)
             if len(all_units) > 1:
                 raise ValueError("All scopes and measurements should be expressed in the same unit.")
@@ -221,9 +225,9 @@ class ScopeSet(BaseOpenEpdSchema):
                     ExternalValidationConfig.QUANTITY_VALIDATOR.validate_same_dimensionality(first, unit)
 
         # can correctly validate unit
-        if cls.allowed_units is not None and len(all_units) == 1 and ExternalValidationConfig.QUANTITY_VALIDATOR:
+        if self.allowed_units is not None and len(all_units) == 1 and ExternalValidationConfig.QUANTITY_VALIDATOR:
             unit = next(iter(all_units))
-            allowed_units = cls.allowed_units if isinstance(cls.allowed_units, tuple) else (cls.allowed_units,)
+            allowed_units = self.allowed_units if isinstance(self.allowed_units, tuple) else (self.allowed_units,)
 
             matched_unit = False
             for allowed_unit in allowed_units:
@@ -237,7 +241,7 @@ class ScopeSet(BaseOpenEpdSchema):
                     f"'{', '.join(allowed_units)}' is only allowed unit for this scopeset. Provided '{unit}'"
                 )
 
-        return values
+        return self
 
 
 class ScopesetByNameBase(BaseOpenEpdSchema, extra="allow"):
@@ -279,7 +283,7 @@ class ScopesetByNameBase(BaseOpenEpdSchema, extra="allow"):
     def _extra_scopeset_validator(cls, values: dict[str, Any]) -> dict[str, Any]:
         for f in values:
             # only interested in validating the extra fields
-            if f in cls.__fields__:
+            if f in cls.model_fields:
                 continue
 
             # extra impact of an unknown type - engage validation of ScopeSet
@@ -298,97 +302,103 @@ class ScopesetByNameBase(BaseOpenEpdSchema, extra="allow"):
 class ScopeSetGwp(ScopeSet):
     """ScopeSet measured in kgCO2e."""
 
-    allowed_units = "kgCO2e"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgCO2e"
 
 
 class ScopeSetOdp(ScopeSet):
     """ScopeSet measured in kgCFC11e."""
 
-    allowed_units = "kgCFC11e"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgCFC11e"
 
 
 class ScopeSetAp(ScopeSet):
     """ScopeSet measured in kgSO2e."""
 
-    allowed_units = ("kgSO2e", "molHe")
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = ("kgSO2e", "molHe")
 
 
 class ScopeSetEpNe(ScopeSet):
     """ScopeSet measured in kgNe."""
 
-    allowed_units = "kgNe"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgNe"
 
 
 class ScopeSetPocp(ScopeSet):
     """ScopeSet measured in kgO3e."""
 
-    allowed_units = ("kgO3e", "kgNMVOCe")
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = ("kgO3e", "kgNMVOCe")
 
 
 class ScopeSetEpFresh(ScopeSet):
     """ScopeSet measured in kgPO4e."""
 
-    allowed_units = "kgPO4e"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgPO4e"
 
 
 class ScopeSetEpTerr(ScopeSet):
     """ScopeSet measured in molNe."""
 
-    allowed_units = "molNe"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "molNe"
 
 
 class ScopeSetIrp(ScopeSet):
     """ScopeSet measured in kilo Becquerel equivalent of u235."""
 
-    allowed_units = "kBqU235e"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kBqU235e"
 
 
 class ScopeSetCTUh(ScopeSet):
     """ScopeSet measured in CTUh."""
 
-    allowed_units = "CTUh"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "CTUh"
 
 
 class ScopeSetM3Aware(ScopeSet):
     """ScopeSet measured in m3AWARE Water consumption by AWARE method."""
 
-    allowed_units = "m3AWARE"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "m3AWARE"
 
 
 class ScopeSetCTUe(ScopeSet):
     """ScopeSet measured in CTUe."""
 
-    allowed_units = "CTUe"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "CTUe"
+
+
+class ScopeSetKgSbe(ScopeSet):
+    """ScopeSet measured in kgSbe."""
+
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kgSbe"
 
 
 class ScopeSetDiseaseIncidence(ScopeSet):
     """ScopeSet measuring disease incidence measured in AnnualPerCapita (cases)."""
 
-    allowed_units = "AnnualPerCapita"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "AnnualPerCapita"
 
 
 class ScopeSetMass(ScopeSet):
     """ScopeSet measuring mass in kg."""
 
-    allowed_units = "kg"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "kg"
 
 
 class ScopeSetVolume(ScopeSet):
     """ScopeSet measuring mass in kg."""
 
-    allowed_units = "m3"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "m3"
 
 
 class ScopeSetMassOrVolume(ScopeSet):
     """ScopeSet measuring mass in kg OR volume in m3, example: radioactive waste."""
 
-    allowed_units = ("kg", "m3")
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = ("kg", "m3")
 
 
 class ScopeSetEnergy(ScopeSet):
     """ScopeSet measuring mass in kg."""
 
-    allowed_units = "MJ"
+    allowed_units: ClassVar[str | tuple[str, ...] | None] = "MJ"
 
 
 class ImpactSet(ScopesetByNameBase):
@@ -483,6 +493,19 @@ class ImpactSet(ScopesetByNameBase):
         default=None,
         description="Land use related impacts / Soil quality, in potential soil quality parameters.",
     )
+    ADP_mineral: ScopeSetKgSbe | None = pydantic.Field(
+        alias="ADP-mineral",
+        default=None,
+        description='Abiotic depletion potential for non-fossil resources. EN15804 calls this "ADP - minerals and metals".',
+    )
+
+    ADP_fossil: ScopeSetEnergy | None = pydantic.Field(
+        alias="ADP-fossil",
+        default=None,
+        description="Abiotic depletion potential for fossil resources",
+    )
+
+    model_config = pydantic.ConfigDict(from_attributes=True)
 
 
 class LCIAMethod(StrEnum):

openepd/model/org.py

@@ -13,11 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from typing import Annotated, List, Optional
+from typing import Any, Optional
 
 from openlocationcode import openlocationcode
 import pydantic
-from pydantic import ConfigDict, Field, StringConstraints
+from pydantic import ConfigDict
 
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Location, WithAltIdsMixin, WithAttachmentsMixin
@@ -47,36 +47,46 @@ class OrgRef(BaseOpenEpdSchema):
 class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
     """Represent an organization."""
 
-    alt_names: (
-        Annotated[
-            list[str],
-            Annotated[
-                List[Annotated[str, StringConstraints(max_length=200)]],
-                Field(max_length=255),
-            ],
-        ]
-        | None
-    ) = pydantic.Field(
+    alt_names: list[str] | None = pydantic.Field(
         description="List of other names for organization",
         examples=[["C-Change Labs", "C-Change Labs inc."]],
         default=None,
+        max_length=255,
     )
     # TODO: NEW field, not in the spec
 
+    @pydantic.field_validator("alt_names", mode="before")
+    def _validate_alt_names(cls, value: Any) -> list[str] | None:
+        if value is None:
+            return value
+
+        if not isinstance(value, list):
+            raise TypeError(f"Expected type list or None, got {type(value)}")
+
+        if any((len(item) > 200) for item in value):
+            raise ValueError("One or more alt_names are longer than 200 characters")
+
+        return value
+
     owner: Optional["OrgRef"] = pydantic.Field(description="Organization that controls this organization", default=None)
-    subsidiaries: (
-        Annotated[
-            list["OrgRef"],
-            Annotated[
-                List[Annotated[str, StringConstraints(max_length=200)]],
-                Field(max_length=255),
-            ],
-        ]
-        | None
-    ) = pydantic.Field(
-        description="Organizations controlled by this organization",
-        default=None,
+    subsidiaries: list["OrgRef"] | None = pydantic.Field(
+        description="Organizations controlled by this organization", default=None, max_length=255
     )
+
+    @pydantic.field_validator("subsidiaries", mode="before")
+    def _validate_subsidiaries(cls, value: Any) -> list[str] | None:
+        if value is None:
+            return value
+
+        if not isinstance(value, list):
+            raise TypeError(f"Expected type list or None, got {type(value)}")
+
+        for item in value:
+            if len(item.name) > 200:
+                raise ValueError("One or more subsidiaries name are longer than 200 characters")
+
+        return value
+
     hq_location: Location | None = pydantic.Field(
         default=None,
         description="Location of a place of business, preferably the corporate headquarters.",
@@ -111,8 +121,10 @@ class Plant(PlantRef, WithAttachmentsMixin, WithAltIdsMixin):
     pluscode: str | None = pydantic.Field(
         default=None,
         description="(deprecated) Plus code (aka Open Location Code) of plant's location",
-        deprecated="Pluscode field is deprecated. If users need a pluscode they can obtain it from "
-        "`id` like this: `id.spit('.', maxsplit=1)[0]`",
+        json_schema_extra={
+            "deprecated": "Pluscode field is deprecated. If users need a pluscode they can obtain it from "
+            "`id` like this: `id.spit('.', maxsplit=1)[0]`",
+        },
     )
     latitude: float | None = pydantic.Field(
         default=None,

openepd/model/specs/base.py

@@ -20,10 +20,10 @@ from typing import Any
 import pydantic
 from pydantic import ConfigDict
 
-from openepd.model.base import BaseOpenEpdSchema, Version
+from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.validation.common import validate_version_compatibility, validate_version_format
 from openepd.model.validation.quantity import ExternalValidationConfig, QuantityValidator
-from openepd.model.versioning import WithExtVersionMixin
+from openepd.model.versioning import Version, WithExtVersionMixin
 
 
 class BaseOpenEpdSpec(BaseOpenEpdSchema):
@@ -35,6 +35,7 @@ class BaseOpenEpdSpec(BaseOpenEpdSchema):
 class BaseOpenEpdHierarchicalSpec(BaseOpenEpdSpec, WithExtVersionMixin):
     """Base class for new specs (hierarchical, versioned)."""
 
+    # TODO: Refactor work with class-based and instance-based _EXT_VERSION
     def __init__(self, **data: Any) -> None:
         # ensure that all the concrete spec objects fail on creations if they dont have _EXT_VERSION declared to
         # something meaningful

openepd/model/specs/range/furnishings.py

@@ -19,11 +19,11 @@ __all__ = (
     "CountertopsRangeV1",
     "DemountablePartitionsRangeV1",
     "OtherFurnishingsRangeV1",
-    "OpenStorageRangeV1",
-    "ClosedStorageRangeV1",
-    "RetractableStorageRangeV1",
-    "MobileStorageRangeV1",
-    "WallMountedShelvingRangeV1",
+    "OpenStorageFurnitureRangeV1",
+    "ClosedStorageFurnitureRangeV1",
+    "RetractableStorageFurnitureRangeV1",
+    "MobileStorageFurnitureRangeV1",
+    "WallMountedStorageShelvingRangeV1",
     "OtherStorageFurnitureRangeV1",
     "StorageFurnitureRangeV1",
     "TablesRangeV1",
@@ -97,7 +97,7 @@ class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -109,7 +109,7 @@ class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -121,7 +121,7 @@ class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -133,7 +133,7 @@ class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -145,7 +145,7 @@ class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -176,11 +176,11 @@ class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    OpenStorage: OpenStorageRangeV1 | None = None
-    ClosedStorage: ClosedStorageRangeV1 | None = None
-    RetractableStorage: RetractableStorageRangeV1 | None = None
-    MobileStorage: MobileStorageRangeV1 | None = None
-    WallMountedShelving: WallMountedShelvingRangeV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureRangeV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureRangeV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureRangeV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureRangeV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingRangeV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureRangeV1 | None = None
 
 

openepd/model/specs/range/steel.py

@@ -35,6 +35,8 @@ __all__ = (
     "SteelRangeV1",
 )
 
+from typing import ClassVar
+
 import pydantic
 
 from openepd.model.common import RangeFloat, RangeRatioFloat
@@ -313,7 +315,7 @@ class SteelRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.1"
+    _EXT_VERSION: ClassVar[str] = "1.1"
 
     yield_tensile_str: AmountRangePressureMpa | None = pydantic.Field(
         default=None,

openepd/model/specs/singular/furnishings.py

@@ -57,7 +57,7 @@ class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -67,7 +67,7 @@ class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -77,7 +77,7 @@ class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -87,7 +87,7 @@ class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -97,7 +97,7 @@ class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -119,11 +119,11 @@ class StorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.1"
 
     # Nested specs:
-    OpenStorage: OpenStorageV1 | None = None
-    ClosedStorage: ClosedStorageV1 | None = None
-    RetractableStorage: RetractableStorageV1 | None = None
-    MobileStorage: MobileStorageV1 | None = None
-    WallMountedShelving: WallMountedShelvingV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureV1 | None = None
 
 

openepd/model/validation/quantity.py

@@ -19,6 +19,7 @@ from typing import TYPE_CHECKING, Any, Callable, ClassVar
 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
@@ -377,17 +378,21 @@ 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"
 
-    @pydantic.model_validator(mode="before")
-    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
 
-        validate_unit_factory(cls.dimensionality_unit)(BaseOpenEpdSchema, values.get("unit"))  # type: ignore[arg-type]
-        return values
+        if self.unit is None:
+            raise ValueError("`unit` is required for dimensionality-validated amounts")
+
+        validate_unit_factory(self.dimensionality_unit)(BaseOpenEpdSchema, self.unit)
+        return self
 
 
 class AmountRangeWithDimensionality(RangeAmount, WithDimensionalityMixin):
@@ -409,7 +414,7 @@ class AmountRangeWithDimensionality(RangeAmount, WithDimensionalityMixin):
 class WithMassKgMixin(WithDimensionalityMixin):
     """Unit validation mixin."""
 
-    dimensionality_unit = MassKgStr.unit
+    dimensionality_unit: ClassVar[str | None] = MassKgStr.unit
 
 
 class AmountMass(Amount, WithMassKgMixin):
@@ -427,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):
@@ -463,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):
@@ -481,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):
@@ -499,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):
@@ -517,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):
@@ -535,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):
@@ -553,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):
@@ -571,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):
@@ -589,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):
@@ -607,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):
@@ -625,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):
@@ -643,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):
@@ -661,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):
@@ -679,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):
@@ -697,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):
@@ -715,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):
@@ -733,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):
@@ -751,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):
@@ -769,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):
@@ -791,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):
@@ -809,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):
@@ -827,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):
@@ -845,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):
@@ -863,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):
@@ -881,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-7.0.0.dist-info → openepd-7.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 7.0.0
+Version: 7.1.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -15,13 +15,15 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: api-client
 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.0.dist-info → openepd-7.1.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-openepd/__init__.py,sha256=o8u8-hR9V6fC9zReuofWQmP29Q8fkc1bRVDKcL0R9MI,801
-openepd/__version__.py,sha256=PCi2D9R69zErtn17M6az0izAFOXYLv1Egqf6d3NPSzc,638
+openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
+openepd/__version__.py,sha256=YE_JkVAHWAazVwAceVI_tNykuQM3UyXJiDIfU2dySlI,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
@@ -7,7 +7,7 @@ openepd/api/average_dataset/industry_epd_sync_api.py,sha256=b3oBjt-HIZuuHd6qDTJg
 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=DVBosgq5iVkG8ttpuu8kUK8oNkWpGv322Tff9TMSi88,1376
+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
@@ -33,22 +33,22 @@ 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=7REXTR3MOBuxu7dg5b89rYCxU-pi6fABmOV43JZ2ZZA,10798
+openepd/model/base.py,sha256=zSV_tgZZsd2x0jgmwfrrncGDTr0QINTDkPJDubk-W7Q,10811
 openepd/model/category.py,sha256=iyzzAsiVwW4zJ61oYsm9Sy-sEBA71-aMFXcJP1Y-dPI,1734
-openepd/model/common.py,sha256=YfPIJ_aVdTbAZPHC6uUgwjrlUO4kXiSQMul9fhqQEN0,14511
+openepd/model/common.py,sha256=TxcLcYDgAgHtS-go8xYzPYnWTHLuE8bUebiVrXMXf5M,14544
 openepd/model/declaration.py,sha256=1NT3NhaYI_5u1K9ErfphOSFMY6r1-97qpBYNxuCmbs0,14687
-openepd/model/epd.py,sha256=fb674IUQtleUIbqK0C4qo7ZVP0G98WSdulP3_N2Ql9o,12576
+openepd/model/epd.py,sha256=KACR_2tbbk0eltaL37MvDxqdJUDWXtiqYGW0_bWl7v4,12730
 openepd/model/factory.py,sha256=doexyqZXJVGd45T1JsbjuyGUjEykW-MerKUq4SQHhRY,2656
-openepd/model/generic_estimate.py,sha256=mdksGzDM92aANIgc1jhwdYKOvCju8aE1iJD3k3lQBwE,4140
+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=aa3IlbVCiC6dYVT3WqLMWBt3JzGOdeda8URC5L130tg,26377
-openepd/model/org.py,sha256=RrfjyEDOaC_Dyp4XNxQgq_FRtxN2ZQmjLpjuZOELrqs,5779
+openepd/model/lcia.py,sha256=swKO8vAISpesYzF-w7HHLjckVhCb3jj3dv4FbIwp3Ak,27749
+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=qHmQux01A1XGzjAtInti_4MS5HAKp1VQpKhC1EhUdc4,2682
+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
@@ -67,7 +67,7 @@ openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,
 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/furnishings.py,sha256=LWu88Y7QEuq7IdNCKQG5v0u0PAWpG919gxkMdmm5Sig,6748
 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
@@ -81,7 +81,7 @@ openepd/model/specs/range/other_materials.py,sha256=k7Gv6YvWy43B-QFBabBt-TkvkC45
 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=XEf5jjfiN8uZlY3QoIccGgI1RRxNPaT7eHZE_YFt95o,10503
+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
@@ -106,7 +106,7 @@ openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.
 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/furnishings.py,sha256=-8_96GZala4_xuI6u29OO0KfGA0OctsD3M5Iid2NHvE,5737
 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
@@ -132,11 +132,10 @@ openepd/model/validation/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA
 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=ots09u4406szY1k1_LVEOxK30fyEWnxml8Z0LlgAbnE,21044
+openepd/model/validation/quantity.py,sha256=zsyNGygYW4GGeWAtyM9708lFdEuebtSctr3qIfNdEXQ,21720
 openepd/model/versioning.py,sha256=de53OlduidxAkDlSbAu6xrIy2IUuCnwI69vUJPCXX_8,4512
-openepd/patch_pydantic.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-7.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-7.0.0.dist-info/METADATA,sha256=f7Da4D9bA9aa394xf_QcKXu0yFnX_oZyjIuiEwFKbrA,9038
-openepd-7.0.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-7.0.0.dist-info/RECORD,,
+openepd-7.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.1.0.dist-info/METADATA,sha256=xmx2tvBuvOMpEzJ_ViXm82pnWkZQ1_XqqnaBBMo11So,9137
+openepd-7.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+openepd-7.1.0.dist-info/RECORD,,

{openepd-7.0.0.dist-info → openepd-7.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

openepd/patch_pydantic.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.
-#