openepd 7.13.4__py3-none-any.whl → 7.14.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 = "7.13.4"
+VERSION = "7.14.0"

openepd/model/common.py

@@ -14,14 +14,16 @@
 #  limitations under the License.
 #
 from enum import StrEnum
-from typing import Annotated, Any, Self
+import math
+import re
+from typing import Annotated, Any, Final, Self
 
 import pydantic
 import pydantic_core
 
 from openepd.model.base import BaseOpenEpdSchema
 
-DATA_URL_REGEX = r"^data:([-\w]+\/[-+\w.]+)?(;?\w+=[-\w]+)*(;base64)?,.*$"
+DATA_URL_REGEX = r"^data:([-\w]+\/[-+\w.]+)?(;?\w+=[-\w]+)*(;base64)?,(.*)$"
 """
 Regular expression pattern for matching Data URLs.
 
@@ -30,6 +32,14 @@ in web pages as if they were external resources.
 The pattern matches the following format: data:[<media-type>][;base64],<data>
 """
 
+DATA_URL_IMAGE_MAX_LENGTH: Final[int] = math.ceil(32 * 1024 * 4 / 3)
+"""
+Maximum allowed length of a data URL image string to ensure the decoded image is less than 32KB.
+
+Base64 encoding overhead (approximately 33%) requires 
+limiting the encoded string length to 4/3 of the file size limit.
+"""
+
 
 class Amount(BaseOpenEpdSchema):
     """A value-and-unit pairing for amounts that do not have an uncertainty."""
@@ -372,3 +382,20 @@ class EnumGroupingAware:
     def get_groupings(cls) -> list[list]:
         """Return logical groupings of the values."""
         return []
+
+
+def validate_data_url(v: pydantic.AnyUrl | None, max_length: int) -> None:
+    """
+    Validate data URL.
+
+    :param v: data URL string.
+    :param max_length: maximum allowed length.
+    :raises ValueError: if the data URL exceeds the maximum length or has invalid format.
+    :return: None
+    """
+    if v and len(v) > max_length:
+        msg = f"URL must not exceed {max_length} characters"
+        raise ValueError(msg)
+    if v and v.scheme == "data" and not re.compile(DATA_URL_REGEX).match(str(v)):
+        msg = "Invalid data URL format"
+        raise ValueError(msg)

openepd/model/declaration.py

@@ -16,14 +16,11 @@
 import abc
 import datetime
 from enum import StrEnum
-import math
-import re
-from typing import Final
 
 import pydantic
 
 from openepd.model.base import BaseOpenEpdSchema, OpenXpdUUID, RootDocument
-from openepd.model.common import DATA_URL_REGEX, Amount
+from openepd.model.common import DATA_URL_IMAGE_MAX_LENGTH, Amount, validate_data_url
 from openepd.model.geography import Geography
 from openepd.model.org import Org
 from openepd.model.pcr import Pcr
@@ -36,14 +33,6 @@ DEVELOPER_DESCRIPTION = "The organization responsible for the underlying LCA (an
 PROGRAM_OPERATOR_DESCRIPTION = "JSON object for program operator Org"
 THIRD_PARTY_VERIFIER_DESCRIPTION = "JSON object for Org that performed a critical review of the EPD data"
 
-PRODUCT_IMAGE_MAX_LENGTH: Final[int] = math.ceil(32 * 1024 * 4 / 3)
-"""
-Maximum length for product_image, product_image_small fields.
-
-Image file size must be less than 32KB. Base64 encoding overhead (approximately 33%) requires 
-limiting the encoded string length to 4/3 of the file size limit.
-"""
-
 
 class BaseDeclaration(RootDocument, abc.ABC):
     """Base class for declaration-related documents (EPDs, Industry-wide EPDs, Generic Estimates)."""
@@ -194,12 +183,7 @@ class BaseDeclaration(RootDocument, abc.ABC):
 
     @pydantic.field_validator("product_image", "product_image_small")
     def validate_product_image(cls, v: pydantic.AnyUrl | None) -> pydantic.AnyUrl | None:
-        if v and len(v) > PRODUCT_IMAGE_MAX_LENGTH:
-            msg = f"URL must not exceed {PRODUCT_IMAGE_MAX_LENGTH} characters"
-            raise ValueError(msg)
-        if v and v.scheme == "data" and not re.compile(DATA_URL_REGEX).match(str(v)):
-            msg = "Invalid data URL format"
-            raise ValueError(msg)
+        validate_data_url(v, DATA_URL_IMAGE_MAX_LENGTH)
         return v
 
 

openepd/model/epd.py

@@ -16,7 +16,13 @@
 import pydantic
 
 from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes, OpenEpdExtension
-from openepd.model.common import Ingredient, WithAltIdsMixin, WithAttachmentsMixin
+from openepd.model.common import (
+    DATA_URL_IMAGE_MAX_LENGTH,
+    Ingredient,
+    WithAltIdsMixin,
+    WithAttachmentsMixin,
+    validate_data_url,
+)
 from openepd.model.declaration import (
     DEVELOPER_DESCRIPTION,
     PROGRAM_OPERATOR_DESCRIPTION,
@@ -243,6 +249,11 @@ class EpdPreviewV0(
         msg = "Invalid doctype"
         raise ValueError(msg)
 
+    @pydantic.field_validator("product_usage_image", "manufacturing_image")
+    def validate_product_usage_image(cls, v: pydantic.AnyUrl | None) -> pydantic.AnyUrl | None:
+        validate_data_url(v, DATA_URL_IMAGE_MAX_LENGTH)
+        return v
+
 
 EpdPreview = EpdPreviewV0
 

openepd/model/org.py

@@ -13,26 +13,22 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import math
-import re
-from typing import Any, Final, Optional
+from typing import Any, Optional
 
 from openlocationcode import openlocationcode
 import pydantic
 from pydantic import ConfigDict
 
 from openepd.model.base import BaseOpenEpdSchema
-from openepd.model.common import DATA_URL_REGEX, Location, WithAltIdsMixin, WithAttachmentsMixin
+from openepd.model.common import (
+    DATA_URL_IMAGE_MAX_LENGTH,
+    Location,
+    WithAltIdsMixin,
+    WithAttachmentsMixin,
+    validate_data_url,
+)
 from openepd.model.validation.common import ReferenceStr
 
-ORG_LOGO_MAX_LENGTH: Final[int] = math.ceil(32 * 1024 * 4 / 3)
-"""
-Maximum length of Org.logo field.
-
-Logo file size must be less than 32KB. Base64 encoding overhead (approximately 33%) requires 
-limiting the encoded string length to 4/3 of the file size limit.
-"""
-
 
 class OrgRef(BaseOpenEpdSchema):
     """Represents Organisation with minimal data."""
@@ -142,12 +138,7 @@ class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
 
     @pydantic.field_validator("logo")
     def _validate_logo(cls, v: pydantic.AnyUrl | None) -> pydantic.AnyUrl | None:
-        if v and len(v) > ORG_LOGO_MAX_LENGTH:
-            msg = f"Logo URL must not exceed {ORG_LOGO_MAX_LENGTH} characters"
-            raise ValueError(msg)
-        if v and v.scheme == "data" and not re.compile(DATA_URL_REGEX).match(str(v)):
-            msg = "Invalid data URL format"
-            raise ValueError(msg)
+        validate_data_url(v, DATA_URL_IMAGE_MAX_LENGTH)
         return v
 
 
@@ -232,6 +223,10 @@ class Plant(PlantRef, WithAttachmentsMixin, WithAltIdsMixin):
             msg = "Incorrect pluscode for plant"
             raise ValueError(msg)
 
+        if not openlocationcode.isFull(pluscode):
+            msg = "Passed Open Location Code is not a valid full code"
+            raise ValueError(msg)
+
         if not web_domain:
             msg = "Incorrect web_domain for plant"
             raise ValueError(msg)

{openepd-7.13.4.dist-info → openepd-7.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openepd
-Version: 7.13.4
+Version: 7.14.0
 Summary: Python library to work with OpenEPD format
 License: Apache-2.0
 Author: C-Change Labs

{openepd-7.13.4.dist-info → openepd-7.14.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
-openepd/__version__.py,sha256=Vwc6354wyk-FYpA6SgKgC-HMbPM5MyrY1DsnKvXk_Pc,639
+openepd/__version__.py,sha256=4_OOwkPWzDgb1S9aW43U_I7XLkBn0l8_JXtmi6r1ghA,639
 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=mjTT8eGtfj6Fgp-wcs0cCWA7DJo1KL_iQ75rgKkaY3c,8037
@@ -43,15 +43,15 @@ openepd/m49/utils.py,sha256=0UvdtC9gtvRA5WT_hJDIuQR0RSrnx-S34wwwBRM_tsM,7807
 openepd/model/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/model/base.py,sha256=EVmSzFqIiHQuKODJw_xncYGLy8T9p895MRZdkaeK4Fo,13648
 openepd/model/category.py,sha256=iyzzAsiVwW4zJ61oYsm9Sy-sEBA71-aMFXcJP1Y-dPI,1734
-openepd/model/common.py,sha256=r6VbqOaMAAqEEbXJ0l-_kLDFQJZW_qv5XdZFyOFEFW8,15016
-openepd/model/declaration.py,sha256=ryB0QmbdtufUEwUDZqzudlEAnJ_-4wPR9dwfC8i4zUc,15785
-openepd/model/epd.py,sha256=cS3ZT_72v0gFcEhuDQrF_Zs8-Cob3FjyipUbBpc-xFM,12760
+openepd/model/common.py,sha256=L-nOsl4MmfSMFOehDyJaltwww--W-MR278-F4iVoVic,15924
+openepd/model/declaration.py,sha256=5uNk2y8bJo0DfsCWdDf4F2YkN0RGeiApAA3oZ67uO-0,15194
+openepd/model/epd.py,sha256=N7dzxfgEOvuNOHatr3_KvwRatVJXQ4mHKTbh7FCUrC0,13077
 openepd/model/factory.py,sha256=UWSGpfCr3GiMTP4rzBkwqxzbXB6GKZ_5Okb1Dqa_4aA,2701
 openepd/model/generic_estimate.py,sha256=_R18Uz-hvxtSBl53D0_OkwVCWvoa2nIDjBdec6vEPDE,4304
 openepd/model/geography.py,sha256=Jx7NIDdk_sIvwyh-7YxnIjAwIHW2HCQK7UtFGM2xKtw,42095
 openepd/model/industry_epd.py,sha256=Cqn01IUNSZqRkyU05TwtOLXDKlg0YnGzqvKL8A__zbI,4061
 openepd/model/lcia.py,sha256=6o6GNwLaQaWyYAXCnHl2aAgDa12_v7DwpME5BfVMezk,32780
-openepd/model/org.py,sha256=ij_GEFEShRh-k4o29gSowiaJbCuyNqWu61YL3BNq0FM,9369
+openepd/model/org.py,sha256=1THgP8vLuXEWsHkYDT4k-mdSQ1vKiF9Y4AjNKq0Og_4,9016
 openepd/model/pcr.py,sha256=cu3EakCAjBCkcb_AaLXB-xEjY0mlG-wJe74zGc5tdS0,5637
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
 openepd/model/specs/__init__.py,sha256=-3uaImbGfOkRdpHQkhHe0eimAg0UBntR3WiT21Pmt1I,3837
@@ -156,7 +156,7 @@ openepd/utils/mapping/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dv
 openepd/utils/mapping/common.py,sha256=hxfN-WW2WLwE_agQzf_mhvz6OHq5WWlr24uZ1S81k4Y,8426
 openepd/utils/mapping/geography.py,sha256=1_-dvLk11Hqn-K58yUI5pQ5X5gsnJPFlFT7JK2Rdoeg,2396
 openepd/utils/markdown.py,sha256=RQmudPhb4QU1I4-S-VV2WFbzzq2Po09kbpjjKbwkA9E,1830
-openepd-7.13.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-7.13.4.dist-info/METADATA,sha256=2m7uh56T5qhea2R7E6XOO_KohwCfb1IsEuXKjGeQXYY,9811
-openepd-7.13.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openepd-7.13.4.dist-info/RECORD,,
+openepd-7.14.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.14.0.dist-info/METADATA,sha256=gKmM-w5poyAM8GYRAytiMrIIFQ42fVmXeyrXj32qCJw,9811
+openepd-7.14.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openepd-7.14.0.dist-info/RECORD,,