openepd 4.9.0__py3-none-any.whl → 4.10.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 = "4.9.0"
+VERSION = "4.10.1"

openepd/model/base.py

@@ -37,6 +37,7 @@ class OpenEpdDoctypes(StrEnum):
 
     Epd = "openEPD"
     GenericEstimate = "openGenericEstimate"
+    IndustryEpd = "openIndustryEpd"
 
 
 def modify_pydantic_schema(schema_dict: dict, cls: type) -> dict:

openepd/model/declaration.py

@@ -17,10 +17,17 @@ import abc
 import datetime
 
 from openepd.compat.pydantic import pyd
-from openepd.model.base import RootDocument
+from openepd.model.base import BaseOpenEpdSchema, RootDocument
 from openepd.model.common import Amount
+from openepd.model.geography import Geography
+from openepd.model.org import Org
 from openepd.model.pcr import Pcr
 from openepd.model.standard import Standard
+from openepd.model.validation.common import ReferenceStr
+
+DEVELOPER_DESCRIPTION = "The organization responsible for the underlying LCA (and subsequent summarization as EPD)."
+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"
 
 
 class BaseDeclaration(RootDocument, abc.ABC):
@@ -50,7 +57,7 @@ class BaseDeclaration(RootDocument, abc.ABC):
     kg_per_declared_unit: Amount | None = pyd.Field(
         default=None,
         description="Mass of the product, in kilograms, per declared unit",
-        example=Amount(qty=12.5, unit="kg"),
+        example=Amount(qty=12.5, unit="kg").to_serializable(exclude_unset=True),
     )
     compliance: list[Standard] = pyd.Field(
         description="Standard(s) to which this document is compliant.", default_factory=list
@@ -111,3 +118,76 @@ class BaseDeclaration(RootDocument, abc.ABC):
     In the absence of primary data, cleaning assumptions shall be documented.
     """,
     )
+
+
+class AverageDatasetMixin(pyd.BaseModel, title="Average Dataset"):
+    """Fields common for average dataset (Industry-wide EPDs, Generic Estimates)."""
+
+    description: str | None = pyd.Field(
+        max_length=2000,
+        description="1-paragraph description of the average dataset. Supports plain text or github flavored markdown.",
+    )
+
+    geography: list[Geography] | None = pyd.Field(
+        description="Jurisdiction(s) in which the LCA result is applicable.  An empty array, or absent properties, "
+        "implies global applicability.",
+    )
+
+
+class WithProgramOperatorMixin(pyd.BaseModel):
+    """Object which has a connection to ProgramOperator."""
+
+    program_operator: Org | None = pyd.Field(description=PROGRAM_OPERATOR_DESCRIPTION)
+    program_operator_doc_id: str | None = pyd.Field(
+        max_length=200, description="Document identifier from Program Operator.", example="123-456.789/b"
+    )
+    program_operator_version: str | None = pyd.Field(
+        max_length=200, description="Document version number from Program Operator.", example="4.3.0"
+    )
+
+
+class WithVerifierMixin(pyd.BaseModel):
+    """Set of fields related to verifier."""
+
+    third_party_verifier: Org | None = pyd.Field(description=THIRD_PARTY_VERIFIER_DESCRIPTION)
+    third_party_verification_url: pyd.AnyUrl | None = pyd.Field(
+        description="Optional link to a verification statement.",
+        example="https://we-verify-epds.com/en/letters/123-456.789b.pdf",
+    )
+    third_party_verifier_email: pyd.EmailStr | None = pyd.Field(
+        description="Email address of the third party verifier", example="john.doe@example.com", default=None
+    )
+
+
+class WithEpdDeveloperMixin(pyd.BaseModel):
+    """Set of fields related to EPD Developer."""
+
+    epd_developer: Org | None = pyd.Field(
+        description=DEVELOPER_DESCRIPTION,
+        default=None,
+    )
+    epd_developer_email: pyd.EmailStr | None = pyd.Field(
+        default=None,
+        example="john.doe@we-do-lca.com",
+        description="Email contact for inquiries about development of this EPD. "
+        "This must be an email which can be publicly shared.",
+    )
+
+
+class RefBase(BaseOpenEpdSchema, title="Ref Object"):
+    """Base class for reference-style objects."""
+
+    id: str | None = pyd.Field(
+        description="The unique ID for this object. To ensure global uniqueness, should be registered at "
+        "open-xpd-uuid.cqd.io/register or a coordinating registry.",
+        example="1u7zsed8",
+        default=None,
+    )
+
+    name: str | None = pyd.Field(max_length=200, description="Name of the object", default=None)
+
+    ref: ReferenceStr | None = pyd.Field(
+        default=None,
+        example="https://openepd.buildingtransparency.org/api/generic_estimates/EC300001",
+        description="Reference to this JSON object",
+    )

openepd/model/epd.py

@@ -18,7 +18,15 @@ from typing import Annotated
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes
 from openepd.model.common import Amount, Ingredient, WithAltIdsMixin, WithAttachmentsMixin
-from openepd.model.declaration import BaseDeclaration
+from openepd.model.declaration import (
+    DEVELOPER_DESCRIPTION,
+    PROGRAM_OPERATOR_DESCRIPTION,
+    THIRD_PARTY_VERIFIER_DESCRIPTION,
+    BaseDeclaration,
+    WithEpdDeveloperMixin,
+    WithProgramOperatorMixin,
+    WithVerifierMixin,
+)
 from openepd.model.lcia import WithLciaMixin
 from openepd.model.org import Org, Plant
 from openepd.model.specs import Specs
@@ -27,12 +35,17 @@ from openepd.model.versioning import OpenEpdVersions, Version
 MANUFACTURER_DESCRIPTION = (
     'JSON object for declaring Org. Sometimes called the "Declaration Holder" or "Declaration Owner".'
 )
-DEVELOPER_DESCRIPTION = "The organization responsible for the underlying LCA (and subsequent summarization as EPD)."
-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"
 
 
-class EpdPreviewV0(WithAttachmentsMixin, WithAltIdsMixin, BaseDeclaration, title="EPD (Preview)"):
+class EpdPreviewV0(
+    WithAttachmentsMixin,
+    WithProgramOperatorMixin,
+    WithEpdDeveloperMixin,
+    WithVerifierMixin,
+    WithAltIdsMixin,
+    BaseDeclaration,
+    title="EPD (Preview)",
+):
     """
     EPD preview, used in API list responses and where there is no need for a full object.
 
@@ -67,36 +80,11 @@ class EpdPreviewV0(WithAttachmentsMixin, WithAltIdsMixin, BaseDeclaration, title
         example="https://epd-online.com/EmbeddedEpdList/Download/6029",
     )
     manufacturer: Org | None = pyd.Field(description=MANUFACTURER_DESCRIPTION)
-    epd_developer: Org | None = pyd.Field(
-        description=DEVELOPER_DESCRIPTION,
-        default=None,
-    )
-    epd_developer_email: pyd.EmailStr | None = pyd.Field(
-        default=None,
-        example="john.doe@we-do-lca.com",
-        description="Email contact for inquiries about development of this EPD. "
-        "This must be an email which can be publicly shared.",
-    )
     plants: list[Plant] = pyd.Field(
         max_items=32,
         description="List of object(s) for one or more plant(s) that this declaration applies to.",
         default_factory=list,
     )
-    program_operator: Org | None = pyd.Field(description=PROGRAM_OPERATOR_DESCRIPTION)
-    program_operator_doc_id: str | None = pyd.Field(
-        max_length=200, description="Document identifier from Program Operator.", example="123-456.789/b"
-    )
-    program_operator_version: str | None = pyd.Field(
-        max_length=200, description="Document version number from Program Operator.", example="4.3.0"
-    )
-    third_party_verifier: Org | None = pyd.Field(description=THIRD_PARTY_VERIFIER_DESCRIPTION)
-    third_party_verification_url: pyd.AnyUrl | None = pyd.Field(
-        description="Optional link to a verification statement.",
-        example="https://we-verify-epds.com/en/letters/123-456.789b.pdf",
-    )
-    third_party_verifier_email: pyd.EmailStr | None = pyd.Field(
-        description="Email address of the third party verifier", example="john.doe@example.com", default=None
-    )
     kg_C_per_declared_unit: Amount | None = pyd.Field(
         default=None,
         description="Mass of elemental carbon, per declared unit, contained in the product itself at the manufacturing "

openepd/model/factory.py

@@ -16,6 +16,7 @@
 from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes, RootDocument
 from openepd.model.epd import EpdFactory
 from openepd.model.generic_estimate import GenericEstimateFactory
+from openepd.model.industry_epd import IndustryEpdFactory
 
 
 class DocumentFactory:
@@ -24,6 +25,7 @@ class DocumentFactory:
     DOCTYPE_TO_FACTORY: dict[OpenEpdDoctypes, type[BaseDocumentFactory]] = {
         OpenEpdDoctypes.Epd: EpdFactory,
         OpenEpdDoctypes.GenericEstimate: GenericEstimateFactory,
+        OpenEpdDoctypes.IndustryEpd: IndustryEpdFactory,
     }
 
     @classmethod

openepd/model/generic_estimate.py

@@ -16,13 +16,11 @@
 from enum import StrEnum
 
 from openepd.compat.pydantic import pyd
-from openepd.model.base import BaseDocumentFactory, BaseOpenEpdSchema, OpenEpdDoctypes
+from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes
 from openepd.model.common import WithAltIdsMixin, WithAttachmentsMixin
-from openepd.model.declaration import BaseDeclaration
-from openepd.model.geography import Geography
+from openepd.model.declaration import AverageDatasetMixin, BaseDeclaration, RefBase
 from openepd.model.lcia import WithLciaMixin
 from openepd.model.org import Org
-from openepd.model.validation.common import ReferenceStr
 from openepd.model.versioning import OpenEpdVersions, Version
 
 
@@ -47,27 +45,12 @@ class LicenseTerms(StrEnum):
     """
 
 
-class GenericEstimateRef(BaseOpenEpdSchema, title="Generic Estimate (Ref)"):
+class GenericEstimateRef(RefBase, title="Generic Estimate (Ref)"):
     """Reference (short) version of Generic Estimate object."""
 
-    id: str | None = pyd.Field(
-        description="The unique ID for this document.  To ensure global uniqueness, should be registered at "
-        "open-xpd-uuid.cqd.io/register or a coordinating registry.",
-        example="1u7zsed8",
-        default=None,
-    )
-
-    name: str | None = pyd.Field(max_length=200, description="Name of the generic estimate", default=None)
-
-    ref: ReferenceStr | None = pyd.Field(
-        default=None,
-        example="https://openepd.buildingtransparency.org/api/generic_estimates/EC300001",
-        description="Reference to this GenericEstimate JSON object",
-    )
-
 
 class GenericEstimatePreviewV0(
-    WithAttachmentsMixin, GenericEstimateRef, BaseDeclaration, title="Generic Estimate (preview)"
+    WithAttachmentsMixin, AverageDatasetMixin, GenericEstimateRef, BaseDeclaration, title="Generic Estimate (preview)"
 ):
     """
     Generic Estimate preview, used in API list responses and where there is no need for a full object.
@@ -80,20 +63,13 @@ class GenericEstimatePreviewV0(
         default="openGenericEstimate",
     )
 
-    description: str | None = pyd.Field(
-        max_length=2000,
-        description="1-paragraph description of the Generic Estimate. Supports plain text or github flavored markdown.",
-    )
-
     publisher: Org | None = pyd.Field(description="Organization that published the LCA results.")
+    reviewer: Org | None = pyd.Field(description="Org that performed a critical review of the LCA.")
     reviewer_email: pyd.EmailStr | None = pyd.Field(
         description="Email address of the third party verifier", example="john.doe@example.com", default=None
     )
-    reviewer: Org | None = pyd.Field(description="Org that performed a critical review of the LCA.")
+
     license_terms: LicenseTerms | None = pyd.Field(description="The license terms for use of the data.")
-    geography: list[Geography] | None = pyd.Field(
-        "Jurisdiction(s) in which the LCA result is applicable.  An empty array, or absent properties, implies global applicability."
-    )
     model_repository: pyd.AnyUrl | None = pyd.Field(
         default=None, description="A link to the shared git repository containing the LCA model used for this estimate."
     )
@@ -103,13 +79,7 @@ GenericEstimatePreview = GenericEstimatePreviewV0
 
 
 class GenericEstimateV0(GenericEstimatePreviewV0, WithLciaMixin, WithAltIdsMixin, title="Generic Estimate (Full)"):
-    """
-    Represent a full Generic Estimate object.
-
-    This is considered the most complete valid openEPD object for GenericEstimate. In addition to it, several related
-    models are defined, either with fewer fields (to be used in APIs for list requests) or with more relaxed structure
-    to support related entities matching.
-    """
+    """Full Generic Estimate object."""
 
     _FORMAT_VERSION = OpenEpdVersions.Version0.as_str()
 
@@ -122,10 +92,6 @@ class GenericEstimateWithDepsV0(GenericEstimateV0, title="Generic Estimate (with
     Expanded version of the GenericEstimate.
 
     Contains related entities - orgs - with full fields, to support object matching in implementations.
-
-    For now the implementation matches the above GenericEstimate entity, but they will diverge as normal GE would have
-    some required fields in Org (like web_domain), and WithDeps would not.
-
     """
 
     publisher: Org | None = pyd.Field(description="Organization that published the LCA results.")

openepd/model/geography.py

@@ -356,6 +356,7 @@ class Geography(StrEnum):
     See https://unstats.un.org/unsd/methodology/m49/overview/
 
      * m49_001: Global
+     * m49_003: North America. The continent of North America (numerical code 003) comprises Northern America (numerical code 021), Caribbean (numerical code 029), and Central America (numerical code 013).
      * m49_002: Africa
      * m49_015: Northern Africa
      * m49_202: Sub-Saharan Africa
@@ -957,277 +958,278 @@ class Geography(StrEnum):
     US_WY = "US-WY"
 
     # m49 codification
-    m49_001 = "001"
-    m49_002 = "002"
-    m49_015 = "015"
-    m49_202 = "202"
-    m49_019 = "019"
-    m49_419 = "419"
-    m49_021 = "021"
-    m49_142 = "142"
-    m49_143 = "143"
-    m49_030 = "030"
-    m49_035 = "035"
-    m49_034 = "034"
-    m49_145 = "145"
-    m49_150 = "150"
-    m49_151 = "151"
-    m49_154 = "154"
-    m49_039 = "039"
-    m49_155 = "155"
-    m49_009 = "009"
-    m49_053 = "053"
-    m49_054 = "054"
-    m49_057 = "057"
-    m49_061 = "061"
-    m49_012 = "012"
-    m49_818 = "818"
-    m49_434 = "434"
-    m49_504 = "504"
-    m49_729 = "729"
-    m49_788 = "788"
-    m49_732 = "732"
-    m49_086 = "086"
-    m49_108 = "108"
-    m49_174 = "174"
-    m49_262 = "262"
-    m49_232 = "232"
-    m49_231 = "231"
-    m49_260 = "260"
-    m49_404 = "404"
-    m49_450 = "450"
-    m49_454 = "454"
-    m49_480 = "480"
-    m49_175 = "175"
-    m49_508 = "508"
-    m49_638 = "638"
-    m49_646 = "646"
-    m49_690 = "690"
-    m49_706 = "706"
-    m49_728 = "728"
-    m49_800 = "800"
-    m49_834 = "834"
-    m49_894 = "894"
-    m49_716 = "716"
-    m49_024 = "024"
-    m49_120 = "120"
-    m49_140 = "140"
-    m49_148 = "148"
-    m49_178 = "178"
-    m49_180 = "180"
-    m49_226 = "226"
-    m49_266 = "266"
-    m49_678 = "678"
-    m49_072 = "072"
-    m49_748 = "748"
-    m49_426 = "426"
-    m49_516 = "516"
-    m49_710 = "710"
-    m49_204 = "204"
-    m49_854 = "854"
-    m49_132 = "132"
-    m49_384 = "384"
-    m49_270 = "270"
-    m49_288 = "288"
-    m49_324 = "324"
-    m49_624 = "624"
-    m49_430 = "430"
-    m49_466 = "466"
-    m49_478 = "478"
-    m49_562 = "562"
-    m49_566 = "566"
-    m49_654 = "654"
-    m49_686 = "686"
-    m49_694 = "694"
-    m49_768 = "768"
-    m49_660 = "660"
-    m49_028 = "028"
-    m49_533 = "533"
-    m49_044 = "044"
-    m49_052 = "052"
-    m49_535 = "535"
-    m49_092 = "092"
-    m49_136 = "136"
-    m49_192 = "192"
-    m49_531 = "531"
-    m49_212 = "212"
-    m49_214 = "214"
-    m49_308 = "308"
-    m49_312 = "312"
-    m49_332 = "332"
-    m49_388 = "388"
-    m49_474 = "474"
-    m49_500 = "500"
-    m49_630 = "630"
-    m49_652 = "652"
-    m49_659 = "659"
-    m49_662 = "662"
-    m49_663 = "663"
-    m49_670 = "670"
-    m49_534 = "534"
-    m49_780 = "780"
-    m49_796 = "796"
-    m49_850 = "850"
-    m49_084 = "084"
-    m49_188 = "188"
-    m49_222 = "222"
-    m49_320 = "320"
-    m49_340 = "340"
-    m49_484 = "484"
-    m49_558 = "558"
-    m49_591 = "591"
-    m49_032 = "032"
-    m49_068 = "068"
-    m49_074 = "074"
-    m49_076 = "076"
-    m49_152 = "152"
-    m49_170 = "170"
-    m49_218 = "218"
-    m49_238 = "238"
-    m49_254 = "254"
-    m49_328 = "328"
-    m49_600 = "600"
-    m49_604 = "604"
-    m49_239 = "239"
-    m49_740 = "740"
-    m49_858 = "858"
-    m49_862 = "862"
-    m49_060 = "060"
-    m49_124 = "124"
-    m49_304 = "304"
-    m49_666 = "666"
-    m49_840 = "840"
-    m49_010 = "010"
-    m49_398 = "398"
-    m49_417 = "417"
-    m49_762 = "762"
-    m49_795 = "795"
-    m49_860 = "860"
-    m49_156 = "156"
-    m49_344 = "344"
-    m49_446 = "446"
-    m49_408 = "408"
-    m49_392 = "392"
-    m49_496 = "496"
-    m49_410 = "410"
-    m49_096 = "096"
-    m49_116 = "116"
-    m49_360 = "360"
-    m49_418 = "418"
-    m49_458 = "458"
-    m49_104 = "104"
-    m49_608 = "608"
-    m49_702 = "702"
-    m49_764 = "764"
-    m49_626 = "626"
-    m49_704 = "704"
-    m49_004 = "004"
-    m49_050 = "050"
-    m49_064 = "064"
-    m49_356 = "356"
-    m49_364 = "364"
-    m49_462 = "462"
-    m49_524 = "524"
-    m49_586 = "586"
-    m49_144 = "144"
-    m49_051 = "051"
-    m49_031 = "031"
-    m49_048 = "048"
-    m49_196 = "196"
-    m49_268 = "268"
-    m49_368 = "368"
-    m49_376 = "376"
-    m49_400 = "400"
-    m49_414 = "414"
-    m49_422 = "422"
-    m49_512 = "512"
-    m49_634 = "634"
-    m49_682 = "682"
-    m49_275 = "275"
-    m49_760 = "760"
-    m49_792 = "792"
-    m49_784 = "784"
-    m49_887 = "887"
-    m49_112 = "112"
-    m49_100 = "100"
-    m49_203 = "203"
-    m49_348 = "348"
-    m49_616 = "616"
-    m49_498 = "498"
-    m49_642 = "642"
-    m49_643 = "643"
-    m49_703 = "703"
-    m49_804 = "804"
-    m49_248 = "248"
-    m49_208 = "208"
-    m49_233 = "233"
-    m49_234 = "234"
-    m49_246 = "246"
-    m49_831 = "831"
-    m49_352 = "352"
-    m49_372 = "372"
-    m49_833 = "833"
-    m49_832 = "832"
-    m49_428 = "428"
-    m49_440 = "440"
-    m49_578 = "578"
-    m49_744 = "744"
-    m49_752 = "752"
-    m49_826 = "826"
-    m49_008 = "008"
-    m49_020 = "020"
-    m49_070 = "070"
-    m49_191 = "191"
-    m49_292 = "292"
-    m49_300 = "300"
-    m49_336 = "336"
-    m49_380 = "380"
-    m49_470 = "470"
-    m49_499 = "499"
-    m49_807 = "807"
-    m49_620 = "620"
-    m49_674 = "674"
-    m49_688 = "688"
-    m49_705 = "705"
-    m49_724 = "724"
-    m49_040 = "040"
-    m49_056 = "056"
-    m49_250 = "250"
-    m49_276 = "276"
-    m49_438 = "438"
-    m49_442 = "442"
-    m49_492 = "492"
-    m49_528 = "528"
-    m49_756 = "756"
-    m49_036 = "036"
-    m49_162 = "162"
-    m49_166 = "166"
-    m49_334 = "334"
-    m49_554 = "554"
-    m49_574 = "574"
-    m49_242 = "242"
-    m49_540 = "540"
-    m49_598 = "598"
-    m49_090 = "090"
-    m49_548 = "548"
-    m49_316 = "316"
-    m49_296 = "296"
-    m49_584 = "584"
-    m49_583 = "583"
-    m49_520 = "520"
-    m49_580 = "580"
-    m49_585 = "585"
-    m49_581 = "581"
-    m49_016 = "016"
-    m49_184 = "184"
-    m49_258 = "258"
-    m49_570 = "570"
-    m49_612 = "612"
-    m49_882 = "882"
-    m49_772 = "772"
-    m49_776 = "776"
-    m49_798 = "798"
-    m49_876 = "876"
+    m49_001 = "001"  # Global
+    m49_003 = "003"  # North America. The continent of North America (numerical code 003) comprises Northern America (numerical code 021), Caribbean (numerical code 029), and Central America (numerical code 013).
+    m49_002 = "002"  # Africa
+    m49_015 = "015"  # Northern Africa
+    m49_202 = "202"  # Sub-Saharan Africa
+    m49_019 = "019"  # Americas
+    m49_419 = "419"  # Latin America and the Caribbean
+    m49_021 = "021"  # Northern America
+    m49_142 = "142"  # Asia
+    m49_143 = "143"  # Central Asia
+    m49_030 = "030"  # Eastern Asia
+    m49_035 = "035"  # South-eastern Asia
+    m49_034 = "034"  # Southern Asia
+    m49_145 = "145"  # Western Asia
+    m49_150 = "150"  # Europe
+    m49_151 = "151"  # Eastern Europe
+    m49_154 = "154"  # Northern Europe
+    m49_039 = "039"  # Southern Europe
+    m49_155 = "155"  # Western Europe
+    m49_009 = "009"  # Oceania
+    m49_053 = "053"  # Australia and New Zealand
+    m49_054 = "054"  # Melanesia
+    m49_057 = "057"  # Micronesia
+    m49_061 = "061"  # Polynesia
+    m49_012 = "012"  # Algeria
+    m49_818 = "818"  # Egypt
+    m49_434 = "434"  # Libya
+    m49_504 = "504"  # Morocco
+    m49_729 = "729"  # Sudan
+    m49_788 = "788"  # Tunisia
+    m49_732 = "732"  # Western Sahara
+    m49_086 = "086"  # British Indian Ocean Territory
+    m49_108 = "108"  # Burundi
+    m49_174 = "174"  # Comoros
+    m49_262 = "262"  # Djibouti
+    m49_232 = "232"  # Eritrea
+    m49_231 = "231"  # Ethiopia
+    m49_260 = "260"  # French Southern Territories
+    m49_404 = "404"  # Kenya
+    m49_450 = "450"  # Madagascar
+    m49_454 = "454"  # Malawi
+    m49_480 = "480"  # Mauritius
+    m49_175 = "175"  # Mayotte
+    m49_508 = "508"  # Mozambique
+    m49_638 = "638"  # Réunion
+    m49_646 = "646"  # Rwanda
+    m49_690 = "690"  # Seychelles
+    m49_706 = "706"  # Somalia
+    m49_728 = "728"  # South Sudan
+    m49_800 = "800"  # Uganda
+    m49_834 = "834"  # United Republic of Tanzania
+    m49_894 = "894"  # Zambia
+    m49_716 = "716"  # Zimbabwe
+    m49_024 = "024"  # Angola
+    m49_120 = "120"  # Cameroon
+    m49_140 = "140"  # Central African Republic
+    m49_148 = "148"  # Chad
+    m49_178 = "178"  # Congo
+    m49_180 = "180"  # Democratic Republic of the Congo
+    m49_226 = "226"  # Equatorial Guinea
+    m49_266 = "266"  # Gabon
+    m49_678 = "678"  # Sao Tome and Principe
+    m49_072 = "072"  # Botswana
+    m49_748 = "748"  # Eswatini
+    m49_426 = "426"  # Lesotho
+    m49_516 = "516"  # Namibia
+    m49_710 = "710"  # South Africa
+    m49_204 = "204"  # Benin
+    m49_854 = "854"  # Burkina Faso
+    m49_132 = "132"  # Cabo Verde
+    m49_384 = "384"  # Côte d’Ivoire
+    m49_270 = "270"  # Gambia
+    m49_288 = "288"  # Ghana
+    m49_324 = "324"  # Guinea
+    m49_624 = "624"  # Guinea-Bissau
+    m49_430 = "430"  # Liberia
+    m49_466 = "466"  # Mali
+    m49_478 = "478"  # Mauritania
+    m49_562 = "562"  # Niger
+    m49_566 = "566"  # Nigeria
+    m49_654 = "654"  # Saint Helena
+    m49_686 = "686"  # Senegal
+    m49_694 = "694"  # Sierra Leone
+    m49_768 = "768"  # Togo
+    m49_660 = "660"  # Anguilla
+    m49_028 = "028"  # Antigua and Barbuda
+    m49_533 = "533"  # Aruba
+    m49_044 = "044"  # Bahamas
+    m49_052 = "052"  # Barbados
+    m49_535 = "535"  # Bonaire, Sint Eustatius and Saba
+    m49_092 = "092"  # British Virgin Islands
+    m49_136 = "136"  # Cayman Islands
+    m49_192 = "192"  # Cuba
+    m49_531 = "531"  # Curaçao
+    m49_212 = "212"  # Dominica
+    m49_214 = "214"  # Dominican Republic
+    m49_308 = "308"  # Grenada
+    m49_312 = "312"  # Guadeloupe
+    m49_332 = "332"  # Haiti
+    m49_388 = "388"  # Jamaica
+    m49_474 = "474"  # Martinique
+    m49_500 = "500"  # Montserrat
+    m49_630 = "630"  # Puerto Rico
+    m49_652 = "652"  # Saint Barthélemy
+    m49_659 = "659"  # Saint Kitts and Nevis
+    m49_662 = "662"  # Saint Lucia
+    m49_663 = "663"  # Saint Martin (French Part)
+    m49_670 = "670"  # Saint Vincent and the Grenadines
+    m49_534 = "534"  # Sint Maarten (Dutch part)
+    m49_780 = "780"  # Trinidad and Tobago
+    m49_796 = "796"  # Turks and Caicos Islands
+    m49_850 = "850"  # United States Virgin Islands
+    m49_084 = "084"  # Belize
+    m49_188 = "188"  # Costa Rica
+    m49_222 = "222"  # El Salvador
+    m49_320 = "320"  # Guatemala
+    m49_340 = "340"  # Honduras
+    m49_484 = "484"  # Mexico
+    m49_558 = "558"  # Nicaragua
+    m49_591 = "591"  # Panama
+    m49_032 = "032"  # Argentina
+    m49_068 = "068"  # Bolivia (Plurinational State of)
+    m49_074 = "074"  # Bouvet Island
+    m49_076 = "076"  # Brazil
+    m49_152 = "152"  # Chile
+    m49_170 = "170"  # Colombia
+    m49_218 = "218"  # Ecuador
+    m49_238 = "238"  # Falkland Islands (Malvinas)
+    m49_254 = "254"  # French Guiana
+    m49_328 = "328"  # Guyana
+    m49_600 = "600"  # Paraguay
+    m49_604 = "604"  # Peru
+    m49_239 = "239"  # South Georgia and the South Sandwich Islands
+    m49_740 = "740"  # Suriname
+    m49_858 = "858"  # Uruguay
+    m49_862 = "862"  # Venezuela (Bolivarian Republic of)
+    m49_060 = "060"  # Bermuda
+    m49_124 = "124"  # Canada
+    m49_304 = "304"  # Greenland
+    m49_666 = "666"  # Saint Pierre and Miquelon
+    m49_840 = "840"  # United States of America
+    m49_010 = "010"  # Antarctica
+    m49_398 = "398"  # Kazakhstan
+    m49_417 = "417"  # Kyrgyzstan
+    m49_762 = "762"  # Tajikistan
+    m49_795 = "795"  # Turkmenistan
+    m49_860 = "860"  # Uzbekistan
+    m49_156 = "156"  # China
+    m49_344 = "344"  # China, Hong Kong Special Administrative Region
+    m49_446 = "446"  # China, Macao Special Administrative Region
+    m49_408 = "408"  # Democratic People's Republic of Korea
+    m49_392 = "392"  # Japan
+    m49_496 = "496"  # Mongolia
+    m49_410 = "410"  # Republic of Korea
+    m49_096 = "096"  # Brunei Darussalam
+    m49_116 = "116"  # Cambodia
+    m49_360 = "360"  # Indonesia
+    m49_418 = "418"  # Lao People's Democratic Republic
+    m49_458 = "458"  # Malaysia
+    m49_104 = "104"  # Myanmar
+    m49_608 = "608"  # Philippines
+    m49_702 = "702"  # Singapore
+    m49_764 = "764"  # Thailand
+    m49_626 = "626"  # Timor-Leste
+    m49_704 = "704"  # Viet Nam
+    m49_004 = "004"  # Afghanistan
+    m49_050 = "050"  # Bangladesh
+    m49_064 = "064"  # Bhutan
+    m49_356 = "356"  # India
+    m49_364 = "364"  # Iran (Islamic Republic of)
+    m49_462 = "462"  # Maldives
+    m49_524 = "524"  # Nepal
+    m49_586 = "586"  # Pakistan
+    m49_144 = "144"  # Sri Lanka
+    m49_051 = "051"  # Armenia
+    m49_031 = "031"  # Azerbaijan
+    m49_048 = "048"  # Bahrain
+    m49_196 = "196"  # Cyprus
+    m49_268 = "268"  # Georgia
+    m49_368 = "368"  # Iraq
+    m49_376 = "376"  # Israel
+    m49_400 = "400"  # Jordan
+    m49_414 = "414"  # Kuwait
+    m49_422 = "422"  # Lebanon
+    m49_512 = "512"  # Oman
+    m49_634 = "634"  # Qatar
+    m49_682 = "682"  # Saudi Arabia
+    m49_275 = "275"  # State of Palestine
+    m49_760 = "760"  # Syrian Arab Republic
+    m49_792 = "792"  # Türkiye
+    m49_784 = "784"  # United Arab Emirates
+    m49_887 = "887"  # Yemen
+    m49_112 = "112"  # Belarus
+    m49_100 = "100"  # Bulgaria
+    m49_203 = "203"  # Czechia
+    m49_348 = "348"  # Hungary
+    m49_616 = "616"  # Poland
+    m49_498 = "498"  # Republic of Moldova
+    m49_642 = "642"  # Romania
+    m49_643 = "643"  # Russian Federation
+    m49_703 = "703"  # Slovakia
+    m49_804 = "804"  # Ukraine
+    m49_248 = "248"  # Åland Islands
+    m49_208 = "208"  # Denmark
+    m49_233 = "233"  # Estonia
+    m49_234 = "234"  # Faroe Islands
+    m49_246 = "246"  # Finland
+    m49_831 = "831"  # Guernsey
+    m49_352 = "352"  # Iceland
+    m49_372 = "372"  # Ireland
+    m49_833 = "833"  # Isle of Man
+    m49_832 = "832"  # Jersey
+    m49_428 = "428"  # Latvia
+    m49_440 = "440"  # Lithuania
+    m49_578 = "578"  # Norway
+    m49_744 = "744"  # Svalbard and Jan Mayen Islands
+    m49_752 = "752"  # Sweden
+    m49_826 = "826"  # United Kingdom of Great Britain and Northern Ireland
+    m49_008 = "008"  # Albania
+    m49_020 = "020"  # Andorra
+    m49_070 = "070"  # Bosnia and Herzegovina
+    m49_191 = "191"  # Croatia
+    m49_292 = "292"  # Gibraltar
+    m49_300 = "300"  # Greece
+    m49_336 = "336"  # Holy See
+    m49_380 = "380"  # Italy
+    m49_470 = "470"  # Malta
+    m49_499 = "499"  # Montenegro
+    m49_807 = "807"  # North Macedonia
+    m49_620 = "620"  # Portugal
+    m49_674 = "674"  # San Marino
+    m49_688 = "688"  # Serbia
+    m49_705 = "705"  # Slovenia
+    m49_724 = "724"  # Spain
+    m49_040 = "040"  # Austria
+    m49_056 = "056"  # Belgium
+    m49_250 = "250"  # France
+    m49_276 = "276"  # Germany
+    m49_438 = "438"  # Liechtenstein
+    m49_442 = "442"  # Luxembourg
+    m49_492 = "492"  # Monaco
+    m49_528 = "528"  # Netherlands (Kingdom of the)
+    m49_756 = "756"  # Switzerland
+    m49_036 = "036"  # Australia
+    m49_162 = "162"  # Christmas Island
+    m49_166 = "166"  # Cocos (Keeling) Islands
+    m49_334 = "334"  # Heard Island and McDonald Islands
+    m49_554 = "554"  # New Zealand
+    m49_574 = "574"  # Norfolk Island
+    m49_242 = "242"  # Fiji
+    m49_540 = "540"  # New Caledonia
+    m49_598 = "598"  # Papua New Guinea
+    m49_090 = "090"  # Solomon Islands
+    m49_548 = "548"  # Vanuatu
+    m49_316 = "316"  # Guam
+    m49_296 = "296"  # Kiribati
+    m49_584 = "584"  # Marshall Islands
+    m49_583 = "583"  # Micronesia (Federated States of)
+    m49_520 = "520"  # Nauru
+    m49_580 = "580"  # Northern Mariana Islands
+    m49_585 = "585"  # Palau
+    m49_581 = "581"  # United States Minor Outlying Islands
+    m49_016 = "016"  # American Samoa
+    m49_184 = "184"  # Cook Islands
+    m49_258 = "258"  # French Polynesia
+    m49_570 = "570"  # Niue
+    m49_612 = "612"  # Pitcairn
+    m49_882 = "882"  # Samoa
+    m49_772 = "772"  # Tokelau
+    m49_776 = "776"  # Tonga
+    m49_798 = "798"  # Tuvalu
+    m49_876 = "876"  # Wallis and Futuna Islands
 
 
 class Country(StrEnum):

openepd/model/industry_epd.py

@@ -0,0 +1,98 @@
+#
+#  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.compat.pydantic import pyd
+from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes
+from openepd.model.common import WithAltIdsMixin, WithAttachmentsMixin
+from openepd.model.declaration import (
+    AverageDatasetMixin,
+    BaseDeclaration,
+    RefBase,
+    WithEpdDeveloperMixin,
+    WithProgramOperatorMixin,
+    WithVerifierMixin,
+)
+from openepd.model.lcia import WithLciaMixin
+from openepd.model.org import Org
+from openepd.model.versioning import OpenEpdVersions, Version
+
+
+class IndustryEpdRef(RefBase, title="Industry EPD (Ref)"):
+    """Reference (short) version of Industry average EPD object."""
+
+
+class IndustryEpdPreviewV0(
+    WithAttachmentsMixin,
+    AverageDatasetMixin,
+    WithEpdDeveloperMixin,
+    WithVerifierMixin,
+    WithProgramOperatorMixin,
+    IndustryEpdRef,
+    BaseDeclaration,
+    title="Industry EPD (preview)",
+):
+    """
+    Industry EPD Preview object.
+
+    Used in lists and other cases where full LCIA data is not required.
+    """
+
+    doctype: str = pyd.Field(
+        description='Describes the type and schema of the document. Must always be "openIndustryEpd"',
+        default="openIndustryEpd",
+    )
+
+    publishers: list[Org] | None = pyd.Field(description="")
+    manufacturers: list[Org] | None = pyd.Field(description="Participating manufacturers")
+
+
+IndustryEpdPreview = IndustryEpdPreviewV0
+
+
+class IndustryEpdV0(IndustryEpdPreviewV0, WithLciaMixin, WithAltIdsMixin, title="Industry EPD (Full)"):
+    """
+    Full Industry EPD object.
+
+    This is considered the most complete valid openEPD object for IndustryEpd. In addition to it, several related
+    models are defined, either with fewer fields (to be used in APIs for list requests) or with more relaxed structure
+    to support related entities matching.
+    """
+
+    _FORMAT_VERSION = OpenEpdVersions.Version0.as_str()
+
+
+IndustryEpd = IndustryEpdV0
+
+
+class IndustryEpdWithDepsV0(IndustryEpdV0, title="Industry EPD (with Dependencies)"):
+    """
+    Expanded version of the IndustryEpd.
+
+    Contains related entities - orgs - with full fields, to support object matching in implementations.
+
+    For now the implementation matches the above Industry Epd entity, but they will diverge as normal GE would have
+    some required fields in Org (like web_domain), and WithDeps would not.
+
+    """
+
+
+IndustryEpdWithDeps = IndustryEpdWithDepsV0
+
+
+class IndustryEpdFactory(BaseDocumentFactory[IndustryEpd]):
+    """Factory for EPD objects."""
+
+    DOCTYPE_CONSTRAINT = OpenEpdDoctypes.IndustryEpd
+    VERSION_MAP: dict[Version, type[IndustryEpd]] = {OpenEpdVersions.Version0: IndustryEpdV0}

openepd/model/lcia.py

@@ -322,6 +322,16 @@ class LCIAMethod(StrEnum):
 class Impacts(pyd.BaseModel):
     """List of environmental impacts, compiled per one of the standard Impact Assessment methods."""
 
+    class Config:
+        # pydantic schema generator gets lost in this structure, so we need to re-establish it manually for openapi
+        schema_extra = {
+            "properties": {
+                str(lm): {"description": str(lm), "allOf": [{"$ref": "#/components/schemas/ImpactSet"}]}
+                for lm in LCIAMethod
+            },
+            "additionalProperties": None,
+        }
+
     __root__: dict[LCIAMethod, ImpactSet]
 
     def set_unknown_lcia(self, impact_set: ImpactSet):

openepd/model/specs/generated/electrical.py

@@ -16,6 +16,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import CableTraysMaterial, EnergySource, RacewaysMaterial
+from openepd.model.specs.generated.mixins.conduit_mixin import ConduitMixin
 from openepd.model.validation.quantity import (
     ColorTemperatureStr,
     LengthMmStr,
@@ -290,10 +291,10 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     TaskLighting: TaskLightingV1 | None = None
 
 
-class ElectricalConduitV1(BaseOpenEpdHierarchicalSpec):
+class ElectricalConduitV1(BaseOpenEpdHierarchicalSpec, ConduitMixin):
     """Tubing used to protect and route electrical wiring in a building or structure."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
 
 class ElectricalV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/generated/enums.py

@@ -2491,3 +2491,27 @@ class PlasterComposition(StrEnum):
     ACRYLIC = "Acrylic"
     LIME = "Lime"
     OTHER = "Other"
+
+
+class ConduitMaterial(StrEnum):
+    """
+    Material of the conduit.
+
+    - PVC: Polyvinyl chloride piping
+    - PEX: Cross-linked polethylene piping
+    - HDPE: High density polyethylene piping
+    - PP: Polypropylene
+    - Stainless Steel: Stainless steel conduit
+    - Galvanized Steel: Galvanized steel conduit
+    - Aluminum: Aluminum conduit
+    - Other: Other piping material
+    """
+
+    PVC = "PVC"
+    PEX = "PEX"
+    HDPE = "HDPE"
+    PP = "PP"
+    STAINLESS_STEEL = "Stainless Steel"
+    GALVANIZED_STEEL = "Galvanized Steel"
+    ALUMINUM = "Aluminum"
+    OTHER = "Other"

openepd/model/specs/generated/mixins/__init__.py

@@ -0,0 +1,15 @@
+#
+#  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.
+#

openepd/model/specs/generated/mixins/conduit_mixin.py

@@ -0,0 +1,50 @@
+#
+#  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.
+#
+__all__ = ["ConduitMixin"]
+
+from openepd.compat.pydantic import pyd
+from openepd.model.specs.base import BaseOpenEpdSpec
+from openepd.model.specs.generated.enums import ConduitMaterial
+from openepd.model.validation.quantity import LengthMmStr
+
+
+class ConduitMixin(BaseOpenEpdSpec):
+    """
+    Properties of a conduit.
+
+    Those properties are the same for communication and electrical conduits.
+    """
+
+    nominal_diameter: LengthMmStr | None = pyd.Field(
+        default=None,
+        description="Nominal Diameter is also known as the mean or average outside diameter.",
+        example="100 mm",
+    )
+    outer_diameter: LengthMmStr | None = pyd.Field(
+        default=None,
+        description="The measurement of the distance of a straight line between points on the outer walls of the pipe.",
+        example="100 mm",
+    )
+    inner_diameter: LengthMmStr | None = pyd.Field(
+        default=None,
+        description="The measurement of the distance of a straight line between points on the inner walls of the pipe.",
+        example="100 mm",
+    )
+    wall_thickness: LengthMmStr | None = pyd.Field(
+        default=None, description="Conduit wall thickness.", example="100 mm"
+    )
+
+    material: ConduitMaterial | None = pyd.Field(default=None, description="Material of the conduit.", example="PVC")

openepd/model/specs/generated/network_infrastructure.py

@@ -27,6 +27,7 @@ from openepd.model.specs.generated.enums import (
     RacewaysMaterial,
     RackType,
 )
+from openepd.model.specs.generated.mixins.conduit_mixin import ConduitMixin
 from openepd.model.validation.quantity import ElectricalCurrentStr, LengthMmStr, MassKgStr, validate_unit_factory
 
 
@@ -166,10 +167,10 @@ class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
 
 
-class CommunicationsConduitV1(BaseOpenEpdHierarchicalSpec):
+class CommunicationsConduitV1(BaseOpenEpdHierarchicalSpec, ConduitMixin):
     """Tubing used to protect and route communications wiring in a building or structure."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
 
 class NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/generated/steel.py

@@ -243,7 +243,10 @@ class SteelV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     yield_tensile_str: PressureMPaStr | None = pyd.Field(
-        default=None, description="Yield Tensile strength (Mpa) per unit area", example="100 MPa"
+        default=None,
+        description="Yield Tensile strength (Mpa) per unit area. Yield strength is the point at which a material "
+        "begins to permanently deform or change shape due to applied stress.",
+        example="100 MPa",
     )
     bar_elongation: float | None = pyd.Field(
         default=None, description="Increase in length at break, in percent. Typically 10%-20%", example=0.2

{openepd-4.9.0.dist-info → openepd-4.10.1.dist-info}/METADATA

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

{openepd-4.9.0.dist-info → openepd-4.10.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=A3iFx_kUtK0dkVs7itV9wiL0foJSKpYp8kZwKq3fk2I,638
+openepd/__version__.py,sha256=KzFp1gnpC3_rR0ckYMYd34Zk_3-GVjuHpo3hjsuUjP4,639
 openepd/api/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/base_sync_client.py,sha256=jviqtQgsOVdRq5x7_Yh_Tg8zIdWtVTIUqNCgebf6YDg,20925
 openepd/api/category/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
@@ -30,15 +30,16 @@ openepd/compat/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,62
 openepd/compat/compat_functional_validators.py,sha256=yz6DfWeg7knBHEN_enpCGGTLRknEsecXfpzD1FDlywY,834
 openepd/compat/pydantic.py,sha256=DOjSixsylLqMtFAIARu50sGcT4VPXN_c473q_2JwZQ0,1146
 openepd/model/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
-openepd/model/base.py,sha256=Uy2Fh7Z9nPzrXrOn2aHPoJjktQfVOQ7UBCXiATkPfEQ,9008
+openepd/model/base.py,sha256=o6miTbb4d2BRQ6epN5Jn8mIMkAeoAucd_3op7aEMELc,9044
 openepd/model/category.py,sha256=IQXNGQFQmFZ_H9PRONloX_UOSf1sTMDq1rM1yz8JR0Y,1639
 openepd/model/common.py,sha256=aa_bfotPybPoYyzHtwj5E5X1T-fCEyznMfVUWvpUhiM,5460
-openepd/model/declaration.py,sha256=5mzX24KpsezqBuGFAr-InsgB4FFNqI7HPJeDHQ93ZCI,5322
-openepd/model/epd.py,sha256=bhmPNWQQ28uhaoxE7sW8_mxyswSCEvGovQ2tH69jzUo,10324
-openepd/model/factory.py,sha256=StQUH7GNmRqskMnnRYkr_PLCl5X5sSLEPiYZOIQI9eo,2541
-openepd/model/generic_estimate.py,sha256=cAgZDiYjqNaGXKc6fR8o9380zqgQMB38F0YTQJo__Lo,5508
-openepd/model/geography.py,sha256=OngHXz-Dkg-NrVPIwNPP53xu4-HkQ_fnEfX5fYIVEfA,37417
-openepd/model/lcia.py,sha256=sDZIxyggqHIISCUocgvIEgkmqPLGNSEA3-zUd7TEgsw,18430
+openepd/model/declaration.py,sha256=w-wC5G8QmO8JxnUyMKfrKARer3VIMbs_vQr3SP_BdCE,8638
+openepd/model/epd.py,sha256=RtUeDq1869JJe5fUu-aP31jl_HRAO21NXcLQvRYmQLs,9030
+openepd/model/factory.py,sha256=XP7eeQNW5tqwX_4hfuEb3lK6BFQDb4KB0fSN0r8-lCU,2656
+openepd/model/generic_estimate.py,sha256=0bS3IXJliheYLBhN6aeSpe-rkKYFCegvwUiBzElCLC0,3938
+openepd/model/geography.py,sha256=G3Oz3QBw5n-RiSCAv-vAGxrOZBhwIT5rASnPlo9dkcs,42095
+openepd/model/industry_epd.py,sha256=t6s9JrfHJVJo_egQt6RdyE9u3t8rZi32efM-MoaV8ag,3234
+openepd/model/lcia.py,sha256=bnDVsEo429Go_EneVOkXYIxDu2soxrgxyfzU4OhDR3Q,18827
 openepd/model/org.py,sha256=FHcYh2WOOQrCMyzm0Ow-iP79jMTBPcneidjH6NXIklA,3760
 openepd/model/pcr.py,sha256=SwqLWMj9k_jqIzxz5mh6ttqvtLCspKSpywF5YTBOMsA,5397
 openepd/model/specs/README.md,sha256=W5LSMpZuW5x36cKS4HRfeFsClsRf8J9yHMMICghdc0s,862
@@ -58,10 +59,10 @@ openepd/model/specs/generated/cmu.py,sha256=Vv-aiT4Q7Zl5XTkSCnTeGOpE_ufTy63zt2Z5
 openepd/model/specs/generated/common.py,sha256=iNeJmVYZURVQWewx3zskwnwy7DBuaggCHFWQBThtY2A,1048
 openepd/model/specs/generated/concrete.py,sha256=wnR656XxF6b26aBP4TRijMJf5CdLUzbZtSLXsbE3Yxw,6987
 openepd/model/specs/generated/conveying_equipment.py,sha256=sQSnFccpTIw8sNGywW0KajE1lCHzbVBCISKyrYFW02U,3052
-openepd/model/specs/generated/electrical.py,sha256=571-26lGYG3z5ecmZyxawxO70USatWSzn7_vEXeVAE0,10985
+openepd/model/specs/generated/electrical.py,sha256=kM9lkNq4762VHUesWBPQ7P9RqMELxaaFH6yzZCEgUhA,11075
 openepd/model/specs/generated/electrical_transmission_and_distribution_equipment.py,sha256=h6UQixACOHrquhQ2GFqqYWel_zqOXT-vAkI0o_RLf0A,1978
 openepd/model/specs/generated/electricity.py,sha256=iGtN21K1MRVwoRfO6friVgiXc2b6cVdITbvnXqLmW3k,823
-openepd/model/specs/generated/enums.py,sha256=9JA9hay6s76kStmcAvpmF8NLgsYZA3IkNMRh-TMK2qY,60938
+openepd/model/specs/generated/enums.py,sha256=DD9eQbkSVkV4b8F10rn6_2k8Sn8H01mZmZX5aBnPtuc,61524
 openepd/model/specs/generated/finishes.py,sha256=Sq_jh3xnPlvLAiS6z7AIvWXIz31_bzW4SM_auXSxALE,22421
 openepd/model/specs/generated/fire_and_smoke_protection.py,sha256=zkOlnNCnAZ9MUWk2sDqUX14YxNEDU3MGfUlePG3su0Q,3068
 openepd/model/specs/generated/furnishings.py,sha256=QY_FDsFZaqjCiw2xHsD3kmyBGJA7jCHlSIvaw4TmqXI,2581
@@ -71,14 +72,16 @@ openepd/model/specs/generated/masonry.py,sha256=35yUySGoRCApdZSYWbCjZ_rTR7WRPssz
 openepd/model/specs/generated/material_handling.py,sha256=hx8fisNcFw6GXC7uMfW-4wkGUS8xJA9gTk_WpZGHkqY,1274
 openepd/model/specs/generated/mechanical.py,sha256=qRKvOqRqn2DoyTCOnNwHClyoby0pa4YN8vXuE6CtY8A,9872
 openepd/model/specs/generated/mechanical_insulation.py,sha256=sbXTXT4xOOgvyDeLN4HZ3xCIwKkaPEjoQlRyCrq4tlM,1617
-openepd/model/specs/generated/network_infrastructure.py,sha256=C4y2PKvC-0QXNDz5qFUgMMcK3n8b_9GsLotSWBDaxms,8403
+openepd/model/specs/generated/mixins/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
+openepd/model/specs/generated/mixins/conduit_mixin.py,sha256=ONH8wZ19xqnIDH-mbRpa4m00LqkYVwdr6-tuSR7TgHE,1938
+openepd/model/specs/generated/network_infrastructure.py,sha256=k1sW_STLQZd9S-f687_KYeBLaPAnsCiyBxMeuvEycb4,8493
 openepd/model/specs/generated/openings.py,sha256=cpJr0Qk9FTLktM5hQAOsPBFL36CRP2sKpe_1v1EOVG4,18818
 openepd/model/specs/generated/other_electrical_equipment.py,sha256=HUOI_NfCXn_pmon0KEy11hBrILA5QYtpnme0YqWoEfk,814
 openepd/model/specs/generated/other_materials.py,sha256=ztaZHOr2HbiSpKdz4M1b2jsm_11fMDqZduEYWT1Q_rI,3498
 openepd/model/specs/generated/plumbing.py,sha256=2bd5K2V0BspEfymb_47nYzdP-6OpBgaRc4Oul8OS8jo,4578
 openepd/model/specs/generated/precast_concrete.py,sha256=Qwnm49sCXXmPoIckIUwldDvUq760FzTVaYnFOV6XOEY,7327
 openepd/model/specs/generated/sheathing.py,sha256=06Y9Dy7_9Iy3VfA6fQGr6AUq30u1K_4cIQOe36BCiOs,3636
-openepd/model/specs/generated/steel.py,sha256=nqkGivvAg5rll2NhClhKE6UCORsvPaVgHiuhirKP3Js,9901
+openepd/model/specs/generated/steel.py,sha256=k-zb_3DkS6SOY4B9nqRGLnVOrc69PttOPZjrDnqR9eM,10046
 openepd/model/specs/generated/thermal_moisture_protection.py,sha256=px1GPZyumr1w0r0ikKO1FefHNK66cxYp1PpmZvpTzPU,8205
 openepd/model/specs/generated/utility_piping.py,sha256=X0cHq5kQP41RH1iGWrkwUdFX0PI4V00WzxH9BA-i7SY,2493
 openepd/model/specs/generated/wood.py,sha256=RMNoPRS9K3XF2aXCbvRN3awpO23_5ugYhRCrnvCvI20,6341
@@ -91,7 +94,7 @@ openepd/model/validation/quantity.py,sha256=kzug0MZ3Ao0zeVzN-aleyxUg5hA_7D5tNOOe
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/patch_pydantic.py,sha256=xrkzblatmU9HBzukWkp1cPq9ZSuohoz1p0pQqVKSlKs,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-4.9.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-4.9.0.dist-info/METADATA,sha256=pgDKp3QMBRUOSfTtKsczMpMjOO7n_OEuFwaOz0LR6JI,8534
-openepd-4.9.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-4.9.0.dist-info/RECORD,,
+openepd-4.10.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-4.10.1.dist-info/METADATA,sha256=VGCrT0N2HBiCDYtXUnqW1BFWZ_KycJKBuhlz4f8QzX8,8535
+openepd-4.10.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-4.10.1.dist-info/RECORD,,