openepd 1.10.0__tar.gz → 3.0.0__tar.gz

{openepd-1.10.0 → openepd-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 1.10.0
+Version: 3.0.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: api-client
 Requires-Dist: email-validator (>=1.3.1)
-Requires-Dist: pydantic (>=1.10,<2.0)
+Requires-Dist: pydantic (>=1.10,<3.0)
 Requires-Dist: requests (>=2.0) ; extra == "api-client"
 Project-URL: Repository, https://github.com/cchangelabs/openepd
 Description-Content-Type: text/markdown

{openepd-1.10.0 → openepd-3.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "1.10.0"
+version = "3.0.0"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]
@@ -21,7 +21,7 @@ exclude = ["**/test_*.py", "**/tests/**"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-pydantic = ">=1.10,<2.0"
+pydantic = ">=1.10,<3.0"
 email-validator = ">=1.3.1"
 requests = { version = ">=2.0", optional = true }
 

openepd-3.0.0/src/openepd/__version__.py

@@ -0,0 +1,20 @@
+#
+#  Copyright 2024 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.
+#
+#  This software was developed with support from the Skanska USA,
+#  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
+#  Find out more at www.BuildingTransparency.org
+#
+VERSION = "3.0.0"

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/dto/base.py

@@ -19,7 +19,7 @@
 #
 import abc
 
-import pydantic as pyd
+from openepd.compat.pydantic import pyd
 
 
 class BaseOpenEpdApiModel(pyd.BaseModel):

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/dto/common.py

@@ -21,11 +21,9 @@ import abc
 import datetime
 from typing import Final, Generic, TypeAlias, TypeVar
 
-import pydantic as pyd
-from pydantic.generics import GenericModel
-
 from openepd.api.dto.base import BaseMetaDto, BaseOpenEpdApiModel, MetaExtensionBase
 from openepd.api.dto.meta import PerformanceMetaMixin
+from openepd.compat.pydantic import pyd, pyd_generics
 from openepd.model.base import AnySerializable, BaseOpenEpdSchema
 
 DEFAULT_PAGE_SIZE: Final[int] = 100
@@ -65,7 +63,7 @@ TMetaDto = TypeVar("TMetaDto", bound=BaseMetaDto)
 TMetaExtension = TypeVar("TMetaExtension", bound=MetaExtensionBase)
 
 
-class MetaCollectionDto(BaseOpenEpdApiModel, GenericModel, Generic[TMetaExtension]):
+class MetaCollectionDto(BaseOpenEpdApiModel, pyd_generics.GenericModel, Generic[TMetaExtension]):
     """
     This class is intended to be used as a container for different meta objects.
 
@@ -107,7 +105,7 @@ class BaseMeta(PerformanceMetaMixin, MetaCollectionDto[TMetaExtension], Generic[
 TMeta = TypeVar("TMeta", bound=MetaCollectionDto, covariant=True)
 
 
-class OpenEpdApiResponse(GenericModel, BaseOpenEpdApiModel, Generic[TPayload, TMeta]):
+class OpenEpdApiResponse(pyd_generics.GenericModel, BaseOpenEpdApiModel, Generic[TPayload, TMeta]):
     """Standard DTO representing response from OpenEPD API server."""
 
     payload: TPayload

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/dto/meta.py

@@ -17,9 +17,8 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-import pydantic as pyd
-
 from openepd.api.dto.base import BaseMetaDto, BaseOpenEpdApiModel
+from openepd.compat.pydantic import pyd
 
 
 class PerformanceMeta(BaseMetaDto):

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/dto/mf.py

@@ -17,9 +17,8 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-import pydantic as pyd
-
 from openepd.api.dto.base import BaseOpenEpdApiModel
+from openepd.compat.pydantic import pyd
 
 
 class MaterialFilterDefinition(BaseOpenEpdApiModel):

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/epd/dto.py

@@ -19,12 +19,11 @@
 #
 from typing import TypeAlias
 
-import pydantic as pyd
-
 from openepd.api.dto.base import BaseOpenEpdApiModel
 from openepd.api.dto.common import BaseMeta, OpenEpdApiResponse
 from openepd.api.dto.meta import PagingMetaMixin, WarningMetaMixin
 from openepd.api.dto.mf import MaterialFilterMetaMixin
+from openepd.compat.pydantic import pyd
 from openepd.model.common import Amount
 from openepd.model.epd import Epd
 

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/api/pcr/dto.py

@@ -17,9 +17,8 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-import pydantic as pyd
-
 from openepd.api.dto.base import BaseOpenEpdApiModel
+from openepd.compat.pydantic import pyd
 
 
 class PcrRef(BaseOpenEpdApiModel):

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/bundle/model.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 
 

openepd-3.0.0/src/openepd/compat/pydantic.py

@@ -0,0 +1,29 @@
+#
+#  Copyright 2024 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.
+#
+#  This software was developed with support from the Skanska USA,
+#  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
+#  Find out more at www.BuildingTransparency.org
+#
+try:
+    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]
+
+pydantic = pyd
+
+__all__ = ["pyd", "pydantic", "pyd_generics"]

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/base.py

@@ -20,15 +20,13 @@
 import abc
 from enum import StrEnum
 import json
-from typing import Any, Callable, Generic, Optional, Type, TypeVar
-
-import pydantic as pyd
-from pydantic.generics import GenericModel
+from typing import Any, Callable, Generic, Optional, Type, TypeAlias, TypeVar
 
+from openepd.compat.pydantic import pyd, pyd_generics
 from openepd.model.validation.common import validate_version_compatibility, validate_version_format
 from openepd.model.versioning import OpenEpdVersions, Version
 
-AnySerializable = int | str | bool | float | list | dict | pyd.BaseModel | None
+AnySerializable: TypeAlias = int | str | bool | float | list | dict | pyd.BaseModel | None
 TAnySerializable = TypeVar("TAnySerializable", bound=AnySerializable)
 
 OPENEPD_VERSION_FIELD = "openepd_version"
@@ -158,7 +156,7 @@ class BaseOpenEpdSchema(pyd.BaseModel):
         return None
 
 
-class BaseOpenEpdGenericSchema(GenericModel, BaseOpenEpdSchema):
+class BaseOpenEpdGenericSchema(pyd_generics.GenericModel, BaseOpenEpdSchema):
     """Base class for all OpenEPD generic models."""
 
     pass

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/category.py

@@ -17,8 +17,7 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Amount
 

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/common.py

@@ -20,9 +20,7 @@
 from enum import StrEnum
 from typing import Annotated, Any
 
-import pydantic as pyd
-from pydantic import BaseModel, root_validator
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 
 
@@ -32,7 +30,7 @@ class Amount(BaseOpenEpdSchema):
     qty: float | None = pyd.Field(description="How much of this in the amount.", default=None)
     unit: str | None = pyd.Field(description="Which unit.  SI units are preferred.", example="kg", default=None)
 
-    @root_validator
+    @pyd.root_validator
     def check_qty_or_unit(cls, values: dict[str, Any]):
         """Ensure that qty or unit is provided."""
         if values["qty"] is None and values["unit"] is None:
@@ -93,7 +91,7 @@ class Location(BaseOpenEpdSchema):
     )
 
 
-class WithAttachmentsMixin(BaseModel):
+class WithAttachmentsMixin(pyd.BaseModel):
     """Mixin for objects that can have attachments."""
 
     attachments: dict[Annotated[str, pyd.Field(max_length=200)], pyd.AnyUrl] | None = pyd.Field(
@@ -117,7 +115,7 @@ class WithAttachmentsMixin(BaseModel):
             self.set_attachment(name, url)
 
 
-class WithAltIdsMixin(BaseModel):
+class WithAltIdsMixin(pyd.BaseModel):
     """Mixin for objects that can have alt_ids."""
 
     alt_ids: dict[Annotated[str, pyd.Field(max_length=200)], str] | None = pyd.Field(

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/epd.py

@@ -20,8 +20,7 @@
 import datetime
 from typing import Annotated
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseDocumentFactory, RootDocument
 from openepd.model.common import Amount, Ingredient, WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.lcia import Impacts, OutputFlowSet, ResourceUseSet

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/lcia.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Measurement
 

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/org.py

@@ -19,8 +19,7 @@
 #
 from typing import Annotated, Optional
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Location, WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.validation.common import ReferenceStr

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/pcr.py

@@ -21,8 +21,7 @@ import datetime
 from enum import StrEnum
 from typing import Annotated, Optional
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.org import Org

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/__init__.py

@@ -18,8 +18,7 @@
 #  Find out more at www.BuildingTransparency.org
 #
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs import concrete, steel
 from openepd.model.specs.aluminium import AluminiumV1

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/aluminium.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import RatioFloat
 

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/asphalt.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.common import OpenEPDUnit
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import RatioFloat

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/base.py

@@ -19,8 +19,7 @@
 #
 from typing import Any
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema, Version
 from openepd.model.validation.common import validate_version_compatibility, validate_version_format
 from openepd.model.validation.quantity import QuantityValidator

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/concrete.py

@@ -20,8 +20,7 @@
 from enum import StrEnum
 from typing import Literal
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import OpenEPDUnit
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/glass.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import PositiveInt, RatioFloat

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/steel.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import OpenEPDUnit
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/specs/wood.py

@@ -19,8 +19,7 @@
 #
 from enum import StrEnum
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import RatioFloat

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/standard.py

@@ -17,8 +17,7 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.org import Org
 

openepd-3.0.0/src/openepd/model/validation/__init__.py

@@ -0,0 +1,19 @@
+#
+#  Copyright 2024 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.
+#
+#  This software was developed with support from the Skanska USA,
+#  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
+#  Find out more at www.BuildingTransparency.org
+#

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/validation/common.py

@@ -19,8 +19,7 @@
 #
 from typing import Annotated, Any, Callable, Type, TypeAlias
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.versioning import Version
 
 

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/validation/numbers.py

@@ -19,7 +19,7 @@
 #
 from typing import Annotated
 
-import pydantic as pyd
+from openepd.compat.pydantic import pyd
 
 # todo when move to pydantic 2, check that validators are being enforced.
 RatioFloat = Annotated[float, pyd.Field(ge=0, le=1, example=0.5)]

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/validation/quantity.py

@@ -20,8 +20,7 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Annotated, Callable, TypeAlias
 
-import pydantic as pyd
-
+from openepd.compat.pydantic import pyd
 from openepd.model.common import OpenEPDUnit
 
 if TYPE_CHECKING:

{openepd-1.10.0 → openepd-3.0.0}/src/openepd/model/versioning.py

@@ -21,11 +21,10 @@ from abc import ABC
 from enum import ReprEnum
 from typing import ClassVar, NamedTuple
 
-import pydantic as pyd
-from pydantic import BaseModel
+from openepd.compat.pydantic import pyd
 
 
-class WithExtVersionMixin(ABC, BaseModel):
+class WithExtVersionMixin(ABC, pyd.BaseModel):
     """Mixin for extensions supporting versions: recommended way."""
 
     _EXT_VERSION: ClassVar[str]

openepd-1.10.0/src/openepd/__version__.py

@@ -1,20 +0,0 @@
-#
-#  Copyright 2024 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.
-#
-#  This software was developed with support from the Skanska USA,
-#  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
-#  Find out more at www.BuildingTransparency.org
-#
-VERSION = "1.10.0"