openepd 7.10.0__tar.gz → 7.11.1__tar.gz

{openepd-7.10.0 → openepd-7.11.1}/PKG-INFO

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

{openepd-7.10.0 → openepd-7.11.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "7.10.0"
+version = "7.11.1"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]

{openepd-7.10.0 → openepd-7.11.1}/src/openepd/__version__.py

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

{openepd-7.10.0 → openepd-7.11.1}/src/openepd/model/common.py

@@ -87,7 +87,7 @@ class Measurement(BaseOpenEpdSchema):
     """A scientific value with units and uncertainty."""
 
     mean: float = pydantic.Field(description="Mean (expected) value of the measurement")
-    unit: str | None = pydantic.Field(description="Measurement unit")
+    unit: str | None = pydantic.Field(description="Measurement unit", default=None)
     rsd: pydantic.PositiveFloat | None = pydantic.Field(
         description="Relative standard deviation, i.e. standard_deviation/mean",
         default=None,

{openepd-7.10.0 → openepd-7.11.1}/src/openepd/model/declaration.py

@@ -16,11 +16,14 @@
 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 Amount
+from openepd.model.common import DATA_URL_REGEX, Amount
 from openepd.model.geography import Geography
 from openepd.model.org import Org
 from openepd.model.pcr import Pcr
@@ -33,6 +36,14 @@ 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)."""
@@ -138,11 +149,11 @@ class BaseDeclaration(RootDocument, abc.ABC):
     )
 
     product_image_small: pydantic.AnyUrl | None = pydantic.Field(
-        description="Pointer to image illustrating the product, which is no more than 200x200 pixels",
+        description="URL referencing an image illustrating the product.  May be a dataURL of up to 32kb.  200x200 or smaller.",
         default=None,
     )
     product_image: pydantic.AnyUrl | pydantic.FileUrl | None = pydantic.Field(
-        description="pointer to image illustrating the product no more than 10MB",
+        description="URL referencing an image illustrating the product, of no more than 10MB.  May be a dataURL of up to 32KB.",
         default=None,
     )
     declaration_url: str | None = pydantic.Field(
@@ -181,6 +192,16 @@ class BaseDeclaration(RootDocument, abc.ABC):
             return value.strip()
         return value
 
+    @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)
+        return v
+
 
 class AverageDatasetMixin(pydantic.BaseModel, title="Average Dataset"):
     """Fields common for average dataset (Industry-wide EPDs, Generic Estimates)."""