openepd 3.5.1__tar.gz → 4.1.0__tar.gz

{openepd-3.5.1 → openepd-4.1.0}/PKG-INFO

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

{openepd-3.5.1 → openepd-4.1.0}/pyproject.toml

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

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/__version__.py

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

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/api/pcr/sync_api.py

@@ -14,8 +14,7 @@
 #  limitations under the License.
 #
 from openepd.api.base_sync_client import BaseApiMethodGroup
-from openepd.api.pcr.dto import PcrRef
-from openepd.model.pcr import Pcr
+from openepd.model.pcr import Pcr, PcrRef
 
 
 class PcrApi(BaseApiMethodGroup):

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/model/org.py

@@ -35,7 +35,7 @@ class OrgRef(BaseOpenEpdSchema):
     )
     ref: ReferenceStr | None = pyd.Field(
         default=None,
-        example="https://buildingtransparency.org/ec3/epds/1u7zsed8",
+        example="https://openepd.buildingtransparency.org/api/orgs/c-change-labs.com",
         description="Reference to this Org's JSON object",
     )
 
@@ -53,7 +53,6 @@ class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
     owner: Optional["OrgRef"] = pyd.Field(description="Organization that controls this organization", default=None)
     subsidiaries: Annotated[list["OrgRef"], pyd.conlist(pyd.constr(max_length=200), max_items=255)] | None = pyd.Field(
         description="Organizations controlled by this organization",
-        example=["cqd.io", "supplychaincarbonpricing.org"],
         default=None,
     )
     hq_location: Location | None = pyd.Field(

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/model/pcr.py

@@ -19,7 +19,7 @@ from typing import Annotated, Optional
 
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
-from openepd.model.common import WithAltIdsMixin, WithAttachmentsMixin
+from openepd.model.common import Amount, WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.org import Org
 
 
@@ -33,6 +33,26 @@ class PcrStatus(StrEnum):
     Sunset = "Sunset"
 
 
+class PcrRef(BaseOpenEpdSchema):
+    """Reference to a PCR."""
+
+    id: str | None = pyd.Field(
+        description="The unique ID for this PCR.  To ensure global uniqueness, should be registered "
+        "at open-xpd-uuid.cqd.io/register or a coordinating registry.",
+        example="ec3xpgq2",
+        default=None,
+    )
+    name: str | None = pyd.Field(
+        max_length=200,
+        description="Full document name as listed in source document",
+        example="c-PCR-003 Concrete and concrete elements (EN 16757)",
+    )
+    ref: pyd.AnyUrl | None = pyd.Field(
+        description="Reference to this PCR's JSON object",
+        example="https://openepd.buildingtransparency.org/api/pcrs/1u7zsed8",
+    )
+
+
 class Pcr(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
     """Represent a PCR (Product Category Rules)."""
 
@@ -60,6 +80,11 @@ class Pcr(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
         description="A shortened name without boilerplate text.",
         example="Concrete and Concrete Elements",
     )
+    declared_units: list[Amount] | None = pyd.Field(
+        description="SI declared units for this PCR.  If a functional unit is "
+        "utilized, the declared unit shall refer to the amount of "
+        "product associated with the A1-A3 life cycle stage."
+    )
     version: str | None = pyd.Field(
         description="Document version, as expressed in document.",
         example="1.0.2",

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/model/specs/generated/enums.py

@@ -2422,3 +2422,13 @@ class NAFSPerformanceGrade(StrEnum):
     GRADE_200_PSF = "200 psf"
     GRADE_205_PSF = "205 psf"
     GRADE_210_PSF = "210 psf"
+
+
+class PlasterComposition(StrEnum):
+    """Plaster Composition."""
+
+    CEMENT = "Cement"
+    GYPSUM = "Gypsum"
+    ACRYLIC = "Acrylic"
+    LIME = "Lime"
+    OTHER = "Other"

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/model/specs/generated/finishes.py

@@ -34,6 +34,7 @@ from openepd.model.specs.generated.enums import (
     GypsumFacing,
     GypsumFireRating,
     GypsumThickness,
+    PlasterComposition,
     ResilientFlooringFormFactor,
     ResilientFlooringMaterial,
     ResilientFlooringThickness,
@@ -45,6 +46,7 @@ from openepd.model.specs.generated.enums import (
 )
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import (
+    AreaPerVolumeStr,
     GwpKgCo2eStr,
     LengthMmStr,
     LengthMStr,
@@ -484,10 +486,30 @@ class WallFinishesV1(BaseOpenEpdHierarchicalSpec):
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
 
 
+class PlasterV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Plaster, Stucco, & Render.
+
+    Used for the protective or decorative coating of walls and ceilings and for
+    moulding and casting decorative elements. These are typically gypsum-, lime-,
+    or cement-based. Products in this category refer to dry mix.
+    """
+
+    _EXT_VERSION = "1.0"
+
+    # Own fields:
+    composition: PlasterComposition | None = pyd.Field(default=None, description="", example="Cement")
+    application_rate: AreaPerVolumeStr | None = pyd.Field(
+        default=None,
+        description="Typical or reference amount of material covering a unit of a host surface.",
+        example="10 m2/l",
+    )
+
+
 class FinishesV1(BaseOpenEpdHierarchicalSpec):
     """General category - finishes for interior ceilings, floors, walls."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     Flooring: FlooringV1 | None = None
@@ -501,3 +523,4 @@ class FinishesV1(BaseOpenEpdHierarchicalSpec):
     Mirrors: MirrorsV1 | None = None
     PaintingAndCoating: PaintingAndCoatingV1 | None = None
     WallFinishes: WallFinishesV1 | None = None
+    Plaster: PlasterV1 | None = None

{openepd-3.5.1 → openepd-4.1.0}/src/openepd/model/validation/quantity.py

@@ -274,3 +274,9 @@ class MassPerLengthStr(QuantityStr):
     """Mass per unit of length quantity type."""
 
     unit = "kg / m"
+
+
+class AreaPerVolumeStr(QuantityStr):
+    """Area per unit of volume quantity type."""
+
+    unit = "m2 / l"

openepd-3.5.1/src/openepd/api/pcr/dto.py

@@ -1,37 +0,0 @@
-#
-#  Copyright 2024 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-from openepd.api.dto.base import BaseOpenEpdApiModel
-from openepd.compat.pydantic import pyd
-
-
-class PcrRef(BaseOpenEpdApiModel):
-    """Reference to a PCR."""
-
-    id: str | None = pyd.Field(
-        description="The unique ID for this PCR.  To ensure global uniqueness, should be registered "
-        "at open-xpd-uuid.cqd.io/register or a coordinating registry.",
-        example="ec3xpgq2",
-        default=None,
-    )
-    name: str | None = pyd.Field(
-        max_length=200,
-        description="Full document name as listed in source document",
-        example="c-PCR-003 Concrete and concrete elements (EN 16757)",
-    )
-    ref: pyd.AnyUrl | None = pyd.Field(
-        description="Reference to this PCR's JSON object",
-        example="https://openepd.buildingtransparency.org/api/pcrs/1u7zsed8",
-    )