openepd 3.5.0__tar.gz → 4.0.0__tar.gz

{openepd-3.5.0 → openepd-4.0.0}/PKG-INFO

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

{openepd-3.5.0 → openepd-4.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "3.5.0"
+version = "4.0.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.0 → openepd-4.0.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.0"
+VERSION = "4.0.0"

{openepd-3.5.0 → openepd-4.0.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.0 → openepd-4.0.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",
     )
 
@@ -50,15 +50,14 @@ class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
     )
     # TODO: NEW field, not in the spec
 
-    owner: Optional["Org"] = pyd.Field(description="Organization that controls this organization", default=None)
-    subsidiaries: Annotated[list[str], pyd.conlist(pyd.constr(max_length=200), max_items=255)] | None = pyd.Field(
+    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(
         default=None,
-        description="Location of a place of business, prefereably the corporate headquarters.",
+        description="Location of a place of business, preferably the corporate headquarters.",
     )
 
 

{openepd-3.5.0 → openepd-4.0.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.0/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",
-    )