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

openepd/model/generic_estimate.py

@@ -16,12 +16,13 @@
 from enum import StrEnum
 
 from openepd.compat.pydantic import pyd
-from openepd.model.base import BaseDocumentFactory, OpenEpdDoctypes
+from openepd.model.base import BaseDocumentFactory, BaseOpenEpdSchema, OpenEpdDoctypes
 from openepd.model.common import WithAltIdsMixin, WithAttachmentsMixin
 from openepd.model.declaration import BaseDeclaration
 from openepd.model.geography import Geography
 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
 
 
@@ -46,7 +47,28 @@ class LicenseTerms(StrEnum):
     """
 
 
-class GenericEstimatePreviewV0(WithAttachmentsMixin, BaseDeclaration, title="Generic Estimate (preview)"):
+class GenericEstimateRef(BaseOpenEpdSchema, 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)"
+):
     """
     Generic Estimate preview, used in API list responses and where there is no need for a full object.
 
@@ -58,8 +80,6 @@ class GenericEstimatePreviewV0(WithAttachmentsMixin, BaseDeclaration, title="Gen
         default="openGenericEstimate",
     )
 
-    name: str | None = pyd.Field(max_length=200, description="Name of the generic estimate", default=None)
-
     description: str | None = pyd.Field(
         max_length=2000,
         description="1-paragraph description of the Generic Estimate. Supports plain text or github flavored markdown.",

openepd/model/lcia.py

@@ -195,7 +195,34 @@ class ScopeSet(BaseOpenEpdSchema):
     )
 
 
-class ImpactSet(BaseOpenEpdSchema):
+class ScopesetByNameBase(BaseOpenEpdSchema):
+    """Base class for the data structures presented as typed name:scopeset mapping ."""
+
+    def get_scopeset_names(self) -> list[str]:
+        """
+        Get the names of scopesets which have been set by model (not defaults).
+
+        :return: set of names, for example ['gwp', 'odp]
+        """
+        return [self.__fields__[f].alias or f for f in self.__fields_set__]
+
+    def get_scopeset_by_name(self, name: str) -> ScopeSet | None:
+        """
+        Get scopeset by name.
+
+        :param name: The name of the scopeset.
+        :return: A scopeset if found, None otherwise
+        """
+        for f_name, f in self.__fields__.items():
+            if f.alias == name:
+                return getattr(self, f_name)
+            if f_name == name:
+                return getattr(self, f_name)
+
+        return None
+
+
+class ImpactSet(ScopesetByNameBase):
     """A set of impacts, such as GWP, ODP, AP, EP, POCP, EP-marine, EP-terrestrial, EP-freshwater, etc."""
 
     gwp: ScopeSet | None = pyd.Field(
@@ -345,7 +372,7 @@ class Impacts(pyd.BaseModel):
         return self.__root__
 
 
-class ResourceUseSet(BaseOpenEpdSchema):
+class ResourceUseSet(ScopesetByNameBase):
     """A set of resource use indicators, such as RPRec, RPRm, etc."""
 
     RPRec: ScopeSet | None = pyd.Field(
@@ -418,7 +445,7 @@ class ResourceUseSet(BaseOpenEpdSchema):
     )
 
 
-class OutputFlowSet(BaseOpenEpdSchema):
+class OutputFlowSet(ScopesetByNameBase):
     """A set of output flows, such as waste, emissions, etc."""
 
     twd: ScopeSet | None = pyd.Field(

openepd/model/specs/generated/electrical.py

@@ -290,10 +290,16 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
     TaskLighting: TaskLightingV1 | None = None
 
 
+class ElectricalConduitV1(BaseOpenEpdHierarchicalSpec):
+    """Tubing used to protect and route electrical wiring in a building or structure."""
+
+    _EXT_VERSION = "1.0"
+
+
 class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     """Electric power and equipment."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     ElectricalPowerStorage: ElectricalPowerStorageV1 | None = None
@@ -301,3 +307,4 @@ class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     ElectricalGenerationEquipment: ElectricalGenerationEquipmentV1 | None = None
     ElectricPower: ElectricPowerV1 | None = None
     Lighting: LightingV1 | None = None
+    ElectricalConduit: ElectricalConduitV1 | None = None

openepd/model/specs/generated/finishes.py

@@ -468,10 +468,44 @@ class MirrorsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
+class PaintByMassV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by mass.
+
+    Expected declared unit for products is mass of ready to use product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class PaintByVolumeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by volume.
+
+    Expecting declared unit for products is volume of ready to use product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
+class PaintByAreaV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Paintings and coatings by area.
+
+    Expected declared unit is area of host surface covered by the product.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class PaintingAndCoatingV1(BaseOpenEpdHierarchicalSpec):
     """Paintings and coatings."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
+
+    PaintByMass: PaintByMassV1 | None = None
+    PaintByVolume: PaintByVolumeV1 | None = None
+    PaintByArea: PaintByAreaV1 | None = None
 
 
 class WallFinishesV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/generated/network_infrastructure.py

@@ -166,10 +166,16 @@ class NetworkingRacewaysV1(BaseOpenEpdHierarchicalSpec):
     raceways_material: RacewaysMaterial | None = pyd.Field(default=None, description="", example="Aluminum")
 
 
+class CommunicationsConduitV1(BaseOpenEpdHierarchicalSpec):
+    """Tubing used to protect and route communications wiring in a building or structure."""
+
+    _EXT_VERSION = "1.0"
+
+
 class NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):
     """General category for network infrastructure products for data centers and commercial and residential buildings."""
 
-    _EXT_VERSION = "1.0"
+    _EXT_VERSION = "1.1"
 
     # Nested specs:
     PDU: PDUV1 | None = None
@@ -178,3 +184,4 @@ class NetworkInfrastructureV1(BaseOpenEpdHierarchicalSpec):
     FloorBoxesAndAccessories: FloorBoxesAndAccessoriesV1 | None = None
     NetworkingCableTrays: NetworkingCableTraysV1 | None = None
     NetworkingRaceways: NetworkingRacewaysV1 | None = None
+    CommunicationsConduit: CommunicationsConduitV1 | None = None

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

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

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

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=pMpg9-CrnTUE6GtcD2aL-Z8bPoVZ7HOk38EYJxrVfGo,638
+openepd/__version__.py,sha256=A3iFx_kUtK0dkVs7itV9wiL0foJSKpYp8kZwKq3fk2I,638
 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
@@ -36,9 +36,9 @@ 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=RSpQ4F4uVpwLg7NeymoX-V7c4vw3vbR5O4oObFON62A,4764
+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=Cw4dwEy5Fb13XyYxpqQyGNhkuZNdjsjucAC7L1TAn7I,17560
+openepd/model/lcia.py,sha256=sDZIxyggqHIISCUocgvIEgkmqPLGNSEA3-zUd7TEgsw,18430
 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,11 +58,11 @@ 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=z4v6zbDvyMSYwbz7kb70aks1Ik9Q14ZkLss7cLqUdTs,10755
+openepd/model/specs/generated/electrical.py,sha256=571-26lGYG3z5ecmZyxawxO70USatWSzn7_vEXeVAE0,10985
 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/finishes.py,sha256=QHFtUZcUCGAzZeHJlLoG1D9SxAW9FGPj7g48Fu1Nvdc,21660
+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
 openepd/model/specs/generated/grouting.py,sha256=mDpfsax6TO72SuBqv8HftJDYoQPP741dD1vi_2cuNCE,934
@@ -71,7 +71,7 @@ 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=GTdoFYj-ZU3rVqFrxb7hY5WzbyN3NnwtqnduH0wODeg,8157
+openepd/model/specs/generated/network_infrastructure.py,sha256=C4y2PKvC-0QXNDz5qFUgMMcK3n8b_9GsLotSWBDaxms,8403
 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
@@ -91,7 +91,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.7.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-4.7.0.dist-info/METADATA,sha256=cZp9von79AjPkfMiN8va1GOm7Imr7D73byVhyoYBlaI,8534
-openepd-4.7.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-4.7.0.dist-info/RECORD,,
+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,,