openepd 7.10.0__py3-none-any.whl → 7.11.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 = "7.10.0"
+VERSION = "7.11.1"

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/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)."""

{openepd-7.10.0.dist-info → openepd-7.11.1.dist-info}/METADATA

@@ -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.dist-info → openepd-7.11.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
-openepd/__version__.py,sha256=A_q9rcTFYq13WDk7bIUKJZzeX5llV-alCEOuzu5ADlg,639
+openepd/__version__.py,sha256=1vquf4mm-jZnqSUJcQPR6JgTjyeY7p1E7jsrt15-KEs,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,8 +43,8 @@ openepd/m49/utils.py,sha256=0UvdtC9gtvRA5WT_hJDIuQR0RSrnx-S34wwwBRM_tsM,7807
 openepd/model/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/model/base.py,sha256=4D8BaSoNeY8RZfjkmJOSyfg0B34dKzM76lZbQT9AIXg,13622
 openepd/model/category.py,sha256=iyzzAsiVwW4zJ61oYsm9Sy-sEBA71-aMFXcJP1Y-dPI,1734
-openepd/model/common.py,sha256=a4FFM5moxEyOTAQuf0eZTbWb3vz2deGh37j1nLg3f0k,15002
-openepd/model/declaration.py,sha256=n55PqeIsBGT4UGHjGyb92txuoPB_S0eZ3lcmUAuS4NQ,14843
+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/factory.py,sha256=UWSGpfCr3GiMTP4rzBkwqxzbXB6GKZ_5Okb1Dqa_4aA,2701
 openepd/model/generic_estimate.py,sha256=_R18Uz-hvxtSBl53D0_OkwVCWvoa2nIDjBdec6vEPDE,4304
@@ -154,7 +154,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.10.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-7.10.0.dist-info/METADATA,sha256=9Pw7b7swT8988umoBB0OJAN2YCxYmzuKRm_2e-aYb-w,9811
-openepd-7.10.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openepd-7.10.0.dist-info/RECORD,,
+openepd-7.11.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.11.1.dist-info/METADATA,sha256=q52RNUOrhHSCeossTQIOqMjDEeOU-WPcqdkhxxx3hm4,9811
+openepd-7.11.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openepd-7.11.1.dist-info/RECORD,,