openepd 6.3.1__py3-none-any.whl → 6.4.1__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.1"
+VERSION = "6.4.1"

openepd/model/common.py

@@ -24,7 +24,7 @@ from openepd.model.validation.numbers import RatioFloat
 class Amount(BaseOpenEpdSchema):
     """A value-and-unit pairing for amounts that do not have an uncertainty."""
 
-    qty: float | None = pyd.Field(description="How much of this in the amount.", default=None)
+    qty: float | None = pyd.Field(description="How much of this in the amount.", ge=0, default=None)
     unit: str | None = pyd.Field(description="Which unit.  SI units are preferred.", example="kg", default=None)
 
     @pyd.root_validator
@@ -117,6 +117,18 @@ class Ingredient(BaseOpenEpdSchema):
     )
     citation: str | None = pyd.Field(default=None, description="Text citation describing the data source ")
 
+    @pyd.root_validator(skip_on_failure=True)
+    def _validate_evidence(cls, values: dict[str, Any]) -> dict[str, Any]:
+        # gwp_fraction should be backed by some type of evidence (fraction coming from product EPD etc) to be accounted
+        # for in the calculation of uncertainty
+        if values.get("gwp_fraction"):
+            if not values.get("evidence_type"):
+                raise ValueError("evidence_type is required if gwp_fraction is provided")
+            if not (values.get("citation") or values.get("link")):
+                raise ValueError("link or citation is required if gwp_fraction is provided")
+
+        return values
+
 
 class LatLng(BaseOpenEpdSchema):
     """A latitude and longitude."""

openepd/model/epd.py

@@ -38,6 +38,7 @@ MANUFACTURER_DESCRIPTION = (
     'JSON object for declaring Org. Sometimes called the "Declaration Holder" or "Declaration Owner".'
 )
 
+PLANT_DESCRIPTION = "List of object(s) for one or more plant(s) that this declaration applies to."
 
 #
 #  Copyright 2024 by C Change Labs Inc. www.c-change-labs.com
@@ -161,7 +162,7 @@ class EpdPreviewV0(
     manufacturer: Org | None = pyd.Field(description=MANUFACTURER_DESCRIPTION)
     plants: list[Plant] = pyd.Field(
         max_items=32,
-        description="List of object(s) for one or more plant(s) that this declaration applies to.",
+        description=PLANT_DESCRIPTION,
         default_factory=list,
     )
 

openepd/model/lcia.py

@@ -357,6 +357,30 @@ class ScopeSetDiseaseIncidence(ScopeSet):
     allowed_units = "AnnualPerCapita"
 
 
+class ScopeSetMass(ScopeSet):
+    """ScopeSet measuring mass in kg."""
+
+    allowed_units = "kg"
+
+
+class ScopeSetVolume(ScopeSet):
+    """ScopeSet measuring mass in kg."""
+
+    allowed_units = "m3"
+
+
+class ScopeSetMassOrVolume(ScopeSet):
+    """ScopeSet measuring mass in kg OR volume in m3, example: radioactive waste."""
+
+    allowed_units = ("kg", "m3")
+
+
+class ScopeSetEnergy(ScopeSet):
+    """ScopeSet measuring mass in kg."""
+
+    allowed_units = "MJ"
+
+
 class ImpactSet(ScopesetByNameBase):
     """A set of impacts, such as GWP, ODP, AP, EP, POCP, EP-marine, EP-terrestrial, EP-freshwater, etc."""
 
@@ -554,71 +578,71 @@ class Impacts(pyd.BaseModel):
 class ResourceUseSet(ScopesetByNameBase):
     """A set of resource use indicators, such as RPRec, RPRm, etc."""
 
-    RPRec: ScopeSet | None = pyd.Field(
+    RPRec: ScopeSetEnergy | None = pyd.Field(
         description="Renewable primary resources used as energy carrier (fuel). "
         "First use bio-based materials used as an energy source. Hydropower, solar and wind power used "
         "in the technosphere are also included in this indicator",
         default=None,
     )
-    RPRm: ScopeSet | None = pyd.Field(
+    RPRm: ScopeSetEnergy | None = pyd.Field(
         description="Renewable primary resources with energy content used as material. "
         "First use biobased materials used as materials (e.g. wood, hemp, etc.).",
         default=None,
     )
-    rpre: ScopeSet | None = pyd.Field(
+    rpre: ScopeSetEnergy | None = pyd.Field(
         description="Renewable primary energy resources as energy",
         default=None,
     )
-    nrpre: ScopeSet | None = pyd.Field(
+    nrpre: ScopeSetEnergy | None = pyd.Field(
         description="Non-renewable primary resources as energy (fuel)",
         default=None,
     )
-    nrprm: ScopeSet | None = pyd.Field(
+    nrprm: ScopeSetEnergy | None = pyd.Field(
         description="Non-renewable primary resources as material",
         default=None,
     )
-    fw: ScopeSet | None = pyd.Field(
+    fw: ScopeSetVolume | None = pyd.Field(
         description="Use of net fresh water",
         default=None,
     )
-    sm: ScopeSet | None = pyd.Field(
+    sm: ScopeSetMass | None = pyd.Field(
         description="Use of secondary materials",
         default=None,
     )
-    rsf: ScopeSet | None = pyd.Field(
+    rsf: ScopeSetEnergy | None = pyd.Field(
         description="Use of renewable secondary materials",
         default=None,
     )
-    nrsf: ScopeSet | None = pyd.Field(
+    nrsf: ScopeSetEnergy | None = pyd.Field(
         description="Use of non-renewable secondary fuels",
         default=None,
     )
-    re: ScopeSet | None = pyd.Field(
+    re: ScopeSetEnergy | None = pyd.Field(
         description="Renewable energy resources",
         default=None,
     )
-    pere: ScopeSet | None = pyd.Field(
+    pere: ScopeSetEnergy | None = pyd.Field(
         description="Use of renewable primary energy excluding renewable primary energy resources used as raw materials",
         default=None,
     )
-    perm: ScopeSet | None = pyd.Field(
+    perm: ScopeSetEnergy | None = pyd.Field(
         description="Use of renewable primary energy resources used as raw materials",
         default=None,
     )
-    pert: ScopeSet | None = pyd.Field(
+    pert: ScopeSetEnergy | None = pyd.Field(
         description="Total use of renewable primary energy resources",
         default=None,
     )
-    penre: ScopeSet | None = pyd.Field(
+    penre: ScopeSetEnergy | None = pyd.Field(
         description="Use of non-renewable primary energy excluding "
         "non-renewable primary energy resources used as raw materials",
         default=None,
     )
-    penrm: ScopeSet | None = pyd.Field(
+    penrm: ScopeSetEnergy | None = pyd.Field(
         description="Use of non-renewable primary energy resources used as raw materials",
         default=None,
     )
-    penrt: ScopeSet | None = pyd.Field(
+    penrt: ScopeSetEnergy | None = pyd.Field(
         description="Total use of non-renewable primary energy resources",
         default=None,
     )
@@ -627,51 +651,51 @@ class ResourceUseSet(ScopesetByNameBase):
 class OutputFlowSet(ScopesetByNameBase):
     """A set of output flows, such as waste, emissions, etc."""
 
-    twd: ScopeSet | None = pyd.Field(
+    twd: ScopeSetMass | None = pyd.Field(
         description="Total waste disposed",
         default=None,
     )
-    hwd: ScopeSet | None = pyd.Field(
+    hwd: ScopeSetMass | None = pyd.Field(
         description="Hazardous waste disposed",
         default=None,
     )
-    nhwd: ScopeSet | None = pyd.Field(
+    nhwd: ScopeSetMass | None = pyd.Field(
         description="Non-hazardous waste disposed",
         default=None,
     )
-    rwd: ScopeSet | None = pyd.Field(
+    rwd: ScopeSetMass | None = pyd.Field(
         description="Radioactive waste disposed",
         default=None,
     )
-    hlrw: ScopeSet | None = pyd.Field(
+    hlrw: ScopeSetMassOrVolume | None = pyd.Field(
         description="High level radioactive waste disposed",
         default=None,
     )
-    illrw: ScopeSet | None = pyd.Field(
+    illrw: ScopeSetMassOrVolume | None = pyd.Field(
         description="Intermediate level radioactive waste disposed",
         default=None,
     )
-    cru: ScopeSet | None = pyd.Field(
+    cru: ScopeSetMass | None = pyd.Field(
         description="Components for re-use",
         default=None,
     )
-    mr: ScopeSet | None = pyd.Field(
+    mr: ScopeSetMass | None = pyd.Field(
         description="Recycled materials",
         default=None,
     )
-    mfr: ScopeSet | None = pyd.Field(
+    mfr: ScopeSetMass | None = pyd.Field(
         description="Materials for recycling",
         default=None,
     )
-    mer: ScopeSet | None = pyd.Field(
+    mer: ScopeSetMass | None = pyd.Field(
         description="Materials for energy recovery",
         default=None,
     )
-    ee: ScopeSet | None = pyd.Field(
+    ee: ScopeSetEnergy | None = pyd.Field(
         description="Exported energy",
         default=None,
     )
-    eh: ScopeSet | None = pyd.Field(
+    eh: ScopeSetEnergy | None = pyd.Field(
         description="Exported heat",
         default=None,
     )

openepd/model/org.py

@@ -66,7 +66,6 @@ class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
 class Plant(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
     """Represent a manufacturing plant."""
 
-    # TODO: Add proper validator
     id: str | None = pyd.Field(
         description="Plus code (aka Open Location Code) of plant's location and "
         "owner's web domain joined with `.`(dot).",
@@ -79,6 +78,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,
@@ -89,12 +94,13 @@ 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:
@@ -103,6 +109,8 @@ class Plant(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
 
     @pyd.validator("id")
     def _validate_id(cls, v: str) -> str:
+        if not v:
+            return v
         try:
             pluscode, web_domain = v.split(".", maxsplit=1)
         except ValueError as e:

openepd/model/specs/enums.py

@@ -2215,7 +2215,7 @@ class AciExposureClass(EnumGroupingAware, StrEnum):
     S1 = "aci.S1"
     S2 = "aci.S2"
     S3 = "aci.S3"
-    C0 = "aci.C1"
+    C0 = "aci.C0"
     C1 = "aci.C1"
     C2 = "aci.C2"
     W0 = "aci.W0"

{openepd-6.3.1.dist-info → openepd-6.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.3.1
+Version: 6.4.1
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0

{openepd-6.3.1.dist-info → openepd-6.4.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=9-O6i7qcYZLc-Ty16U1UcqrtWq9-iQfVCVLwVjya99s,638
+openepd/__version__.py,sha256=ynbiHC7WrNYOSyzyrd2Hj7jVjQQIObp13PMqmGs_IDQ,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
@@ -35,22 +35,22 @@ openepd/compat/pydantic.py,sha256=DOjSixsylLqMtFAIARu50sGcT4VPXN_c473q_2JwZQ0,11
 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/common.py,sha256=4iZAdmQy5UvLKrtmO8OnXsH1HD8jl20c6cv8MUZKW-M,10356
 openepd/model/declaration.py,sha256=oBJ_v_ESoQhybQIH5S5tmYVkgkoX3gwe3nvFyPqb4uk,13832
-openepd/model/epd.py,sha256=AAksfqbpxBiipwsphPil5MvQouCBDMVcAzvIYkeq5OQ,12070
+openepd/model/epd.py,sha256=6G-5cpwaXx5BC6gQns2qlbqmsiEuXrsNmIK4mk1aJaQ,12108
 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=xEYeqcqtmyd9fr322iCYwjhUlpRLREfzDe7gdBL7f04,4588
+openepd/model/lcia.py,sha256=NTUoPv8Yy-f_MCiezEKvB4gx18r0In5vl2e2SuLqQjY,25012
+openepd/model/org.py,sha256=PtG4-EgjKvNSt7446lV60HhDC3YyRx2E-yJ8MMs5raE,5049
 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
 openepd/model/specs/asphalt.py,sha256=V-N7NbrxyNnjgNXQbJPj17ZFM3Q-qxTxxjqpx61wEfA,3350
 openepd/model/specs/base.py,sha256=JgXvfy8K1Jpcai1eCUDZ-ndsLYkL-dcDyH2hQls6Znw,2652
 openepd/model/specs/concrete.py,sha256=spMvijIv79c87PXT_YV7coG851AkJ1ILl9EHCxN2-6E,9593
-openepd/model/specs/enums.py,sha256=rh35d0CZUIp1GDYopldu-dUJ3YQtXlKzJuMpyFLKT2w,63602
+openepd/model/specs/enums.py,sha256=r7Ik8tgL60McK_5ACQn0qhIUTmxjnCQlGvHtFE6m8xM,63602
 openepd/model/specs/range/__init__.py,sha256=LmBClxzTNpWzGwS1zvFoAxbKILrMRMz22mJXKYu2u8I,4502
 openepd/model/specs/range/accessories.py,sha256=T3z-5jLoIVIIGeQi2cc5fMP3a7uGgvoW2E_SVmr3c30,2498
 openepd/model/specs/range/aggregates.py,sha256=nxk6iZHzs0CIoUMWSw4IfB-D4tGd4prh9O2HXnC9u70,2549
@@ -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.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.3.1.dist-info/METADATA,sha256=e71TcIfypVycIAtmh7z2JSBoGJSbaP5-RCK_-xEFn2c,9038
-openepd-6.3.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.3.1.dist-info/RECORD,,
+openepd-6.4.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.4.1.dist-info/METADATA,sha256=YqnvdbcllbapVDL63YMJA-0UJozK9OH5TGhnicVv95I,9038
+openepd-6.4.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.4.1.dist-info/RECORD,,