openepd 6.3.0__py3-none-any.whl → 6.4.0__py3-none-any.whl

openepd/__version__.py

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

openepd/model/declaration.py

@@ -84,7 +84,7 @@ class BaseDeclaration(RootDocument, abc.ABC):
         description="Language this document is captured in, as an ISO 639-1 code",
         example="en",
     )
-    private: bool = pyd.Field(
+    private: bool | None = pyd.Field(
         default=False,
         description="This document's author does not wish the contents published. "
         "Useful for draft, partial, or confidential declarations.  "

openepd/model/epd.py

@@ -23,6 +23,7 @@ from openepd.model.declaration import (
     THIRD_PARTY_VERIFIER_DESCRIPTION,
     BaseDeclaration,
     OriginalDataFormat,
+    RefBase,
     WithEpdDeveloperMixin,
     WithProgramOperatorMixin,
     WithVerifierMixin,
@@ -120,6 +121,12 @@ class Ec3EpdExtension(BaseOpenEpdSchema):
     original_data_format: OriginalDataFormat | None = pyd.Field(default=None)
 
 
+class EpdRef(RefBase, title="EPD (Ref)"):
+    """Reference (short) version of EPD object."""
+
+    pass
+
+
 class EpdPreviewV0(
     WithAttachmentsMixin,
     WithProgramOperatorMixin,

openepd/model/org.py

@@ -15,6 +15,8 @@
 #
 from typing import Annotated, Optional
 
+from openlocationcode import openlocationcode
+
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Location, WithAltIdsMixin, WithAttachmentsMixin
@@ -77,6 +79,12 @@ class Plant(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
         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 = pyd.Field(
+        default=None, description="(deprecated) Latitude of the plant location. Use 'location' fields instead."
+    )
+    longitude: float | None = pyd.Field(
+        default=None, description="(deprecated) Longitude of the plant location. Use 'location' fields instead."
+    )
     owner: Org | None = pyd.Field(description="Organization that owns the plant", default=None)
     name: str | None = pyd.Field(
         max_length=200,
@@ -87,17 +95,32 @@ class Plant(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
     address: str | None = pyd.Field(
         max_length=200,
         default=None,
-        description="Text address, preferably geocoded",
+        description="(deprecated) Text address, preferably geocoded. Use 'location' fields instead",
         example="1503 Orchard Hill Rd, LaGrange, GA 30240, United States",
     )
     contact_email: pyd.EmailStr | None = pyd.Field(
         description="Email contact", example="info@interface.com", default=None
     )
+    location: Location | None = pyd.Field(description="Location of the plant", default=None)
 
     @classmethod
     def get_asset_type(cls) -> str | None:
         """Return the asset type of this class (see BaseOpenEpdSchema.get_asset_type for details)."""
         return "org"
 
+    @pyd.validator("id")
+    def _validate_id(cls, v: str) -> str:
+        try:
+            pluscode, web_domain = v.split(".", maxsplit=1)
+        except ValueError as e:
+            raise ValueError("Incorrectly formed id: should be pluscode.owner_web_domain") from e
+
+        if not openlocationcode.isValid(pluscode):
+            raise ValueError("Incorrect pluscode for plant")
+
+        if not web_domain:
+            raise ValueError("Incorrect web_domain for plant")
+        return v
+
     class Config(BaseOpenEpdSchema.Config):
         allow_population_by_field_name = True

{openepd-6.3.0.dist-info → openepd-6.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.3.0
+Version: 6.4.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -20,6 +20,7 @@ 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: requests (>=2.0) ; extra == "api-client"
 Project-URL: Repository, https://github.com/cchangelabs/openepd

{openepd-6.3.0.dist-info → openepd-6.4.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=1wIJ73gVOCx0Lw2kVyUX8Dyd4XE4Dsx6YsSMF3LC8F4,638
+openepd/__version__.py,sha256=O6qOKVfb9pn636JTuJTFAz0fRVsGULoVFAA8im6tjMQ,638
 openepd/api/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=mxWwDokEGMe87Px8C_aHvIdVKZVHrEAuVtaSA1zJchU,7953
@@ -36,14 +36,14 @@ openepd/model/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/model/base.py,sha256=OEYNFUTL4BivBNAt_LGowTlDuUjvKMHgf5U5ZBncZwQ,9805
 openepd/model/category.py,sha256=IQXNGQFQmFZ_H9PRONloX_UOSf1sTMDq1rM1yz8JR0Y,1639
 openepd/model/common.py,sha256=yx3m9Tqb7WgqW3SaHB3WftQaShD80dxTys2r63rswy8,9700
-openepd/model/declaration.py,sha256=3VFEUHlJTjd-Qzeg5ptue2D6lIeMUYqR5Mcwid3HkqE,13825
-openepd/model/epd.py,sha256=py-mvA-1C2rJCkQRY5O48v3HuMqNHrepulSMgSwQZNI,11952
+openepd/model/declaration.py,sha256=oBJ_v_ESoQhybQIH5S5tmYVkgkoX3gwe3nvFyPqb4uk,13832
+openepd/model/epd.py,sha256=AAksfqbpxBiipwsphPil5MvQouCBDMVcAzvIYkeq5OQ,12070
 openepd/model/factory.py,sha256=XP7eeQNW5tqwX_4hfuEb3lK6BFQDb4KB0fSN0r8-lCU,2656
 openepd/model/generic_estimate.py,sha256=bbU0cR4izSqjZcfxUHNbdO4pllqqd8OaUFikrEgCFoA,3992
 openepd/model/geography.py,sha256=G3Oz3QBw5n-RiSCAv-vAGxrOZBhwIT5rASnPlo9dkcs,42095
 openepd/model/industry_epd.py,sha256=rgXhCUDAgzZ9eGio7ExqE3ymP3zTXnrrwcIDvg5YP1A,3285
 openepd/model/lcia.py,sha256=EChQO_zcc9ZV0cYHCsjjO24pn5oi8d3WMeUxB1Cj3Ww,24390
-openepd/model/org.py,sha256=sgiIt2R9fQd9K1F8PC4a3W0tnRv8rjV1aSZk0g-8jcE,4049
+openepd/model/org.py,sha256=gLzbFt4LNFYLhkAMQUrrAgSu-zC6x5NZ0UiNSQqQ0sc,5043
 openepd/model/pcr.py,sha256=QknLtTn6Y14JORWKQ1qBqGgKnZpbKgqNiYF3Axl4U4c,5494
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
 openepd/model/specs/__init__.py,sha256=IAevXqqYrCWlTH4z4Fy9o77vaOLinX56G05iIJJfm0M,3094
@@ -133,7 +133,7 @@ openepd/model/validation/quantity.py,sha256=UP6x2nUj1nP7G8e2rpi-HigHx9rwKeCuIDh_
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/patch_pydantic.py,sha256=xrkzblatmU9HBzukWkp1cPq9ZSuohoz1p0pQqVKSlKs,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.3.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.3.0.dist-info/METADATA,sha256=9SoVuWAn5ydSG53jxU6jwKRq0Y-8d5t2VjCSt9O8MK0,8996
-openepd-6.3.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.3.0.dist-info/RECORD,,
+openepd-6.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.4.0.dist-info/METADATA,sha256=KZPeu2OsyQ-aYGRDN6-NpqSvTfPgeCoG-hAezksY5wc,9038
+openepd-6.4.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.4.0.dist-info/RECORD,,