openepd 4.0.0__py3-none-any.whl → 4.2.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.0.0"
+VERSION = "4.2.0"

openepd/model/base.py

@@ -56,7 +56,28 @@ def modify_pydantic_schema(schema_dict: dict, cls: type) -> dict:
     return schema_dict
 
 
-class BaseOpenEpdSchema(pyd.BaseModel):
+class PydanticClassAttributeExposeModelMetaclass(pyd.main.ModelMetaclass):
+    """
+    Extension of the pydantic's ModelMetaclass which restores class attribute lookup for fields.
+
+    In pydantic, while the model fields are defined in the model as class-level attributes, in runtime they disappear
+    due to ModelMetaclass logic. ModelMetaclass takes the defined attributes, removes them from class dict and puts
+    into a special __fields__ attribute to avoid naming conflict.
+
+    We would like to be able to access the attributes via dot notation in the runtimes, since it makes refactoring
+    easier.
+
+    This class exposes the original fields when accessed via class name. For example, one can call `Pcr.name` and get
+    `ModelField`, in addition to calling `pcr.__fields__` on an instance.
+    """
+
+    def __getattr__(cls, name: str) -> Any:
+        if name in cls.__fields__:
+            return cls.__fields__[name]
+        return getattr(super, name)
+
+
+class BaseOpenEpdSchema(pyd.BaseModel, metaclass=PydanticClassAttributeExposeModelMetaclass):
     """Base class for all OpenEPD models."""
 
     ext: dict[str, AnySerializable] | None = pyd.Field(alias="ext", default=None)

openepd/model/specs/generated/common.py

@@ -13,6 +13,7 @@
 #  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 BaseOpenEpdSchema
 from openepd.model.org import OrgRef
 
@@ -20,4 +21,6 @@ from openepd.model.org import OrgRef
 class HasForestPracticesCertifiers(BaseOpenEpdSchema):
     """An interface for models which are linked to forest practices certifiers."""
 
-    forest_practices_certifiers: list[OrgRef] | None
+    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(
+        default=None, description="List of organizations that certify forest practices."
+    )

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/model/specs/generated/finishes.py

@@ -14,7 +14,6 @@
 #  limitations under the License.
 #
 from openepd.compat.pydantic import pyd
-from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.common import HasForestPracticesCertifiers
 from openepd.model.specs.generated.enums import (
@@ -34,6 +33,7 @@ from openepd.model.specs.generated.enums import (
     GypsumFacing,
     GypsumFireRating,
     GypsumThickness,
+    PlasterComposition,
     ResilientFlooringFormFactor,
     ResilientFlooringMaterial,
     ResilientFlooringThickness,
@@ -45,6 +45,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,
@@ -177,7 +178,6 @@ class WoodFlooringV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="10 mm")
     timber_species: WoodFlooringTimberSpecies | None = pyd.Field(default=None, description="", example="Oak")
     fabrication: WoodFlooringFabrication | None = pyd.Field(default=None, description="", example="Solid hardwood")
-    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(default=None, description="")
 
 
 class AcousticalCeilingsV1(BaseOpenEpdHierarchicalSpec):
@@ -423,7 +423,6 @@ class DeckingBoardsV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers)
     # Own fields:
     timber_species: SawnTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
     fabrication: AllFabrication | None = pyd.Field(default=None, description="", example="LVL")
-    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(default=None, description="")
     weather_exposed: bool | None = pyd.Field(default=None, description="", example=True)
     fire_retardant: bool | None = pyd.Field(default=None, description="", example=True)
     decay_resistant: bool | None = pyd.Field(default=None, description="", example=True)
@@ -484,10 +483,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 +520,4 @@ class FinishesV1(BaseOpenEpdHierarchicalSpec):
     Mirrors: MirrorsV1 | None = None
     PaintingAndCoating: PaintingAndCoatingV1 | None = None
     WallFinishes: WallFinishesV1 | None = None
+    Plaster: PlasterV1 | None = None

openepd/model/specs/generated/wood.py

@@ -14,7 +14,6 @@
 #  limitations under the License.
 #
 from openepd.compat.pydantic import pyd
-from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.common import HasForestPracticesCertifiers
 from openepd.model.specs.generated.enums import (
@@ -154,9 +153,6 @@ class WoodV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
         default=None, description="Timber species", example="Alaska Cedar"
     )
     fabrication: AllFabrication | None = pyd.Field(default=None, description="Timber fabrication", example="LVL")
-    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(
-        default=None, description="List of organizations that certify forest practices."
-    )
     weather_exposed: bool | None = pyd.Field(default=None, description="Weather exposed", example=True)
     fire_retardant: bool | None = pyd.Field(default=None, description="Fire retardant", example=True)
     decay_resistant: bool | None = pyd.Field(default=None, description="Decay resistant", example=True)

openepd/model/specs/generated/wood_joists.py

@@ -14,7 +14,6 @@
 #  limitations under the License.
 #
 from openepd.compat.pydantic import pyd
-from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.common import HasForestPracticesCertifiers
 from openepd.model.specs.generated.enums import AllFabrication, AllTimberSpecies
@@ -33,7 +32,6 @@ class WoodJoistsV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     # Own fields:
     timber_species: AllTimberSpecies | None = pyd.Field(default=None, description="", example="Alaska Cedar")
     fabrication: AllFabrication | None = pyd.Field(default=None, description="", example="LVL")
-    forest_practices_certifiers: list[OrgRef] | None = pyd.Field(default=None, description="")
     weather_exposed: bool | None = pyd.Field(default=None, description="", example=True)
     fire_retardant: bool | None = pyd.Field(default=None, description="", example=True)
     decay_resistant: bool | None = pyd.Field(default=None, description="", example=True)

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-4.0.0.dist-info → openepd-4.2.0.dist-info}/METADATA

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

{openepd-4.0.0.dist-info → openepd-4.2.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
-openepd/__version__.py,sha256=9t1ToCvhFbSr7mGIm2JugiAa52g5zZ6EQH3fsTUcmiI,638
+openepd/__version__.py,sha256=IT2njgGsj7sZj8Fhuc29NsUD079UbTrJ_u_Mw7RoCMk,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
@@ -30,7 +30,7 @@ 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=wRoFYIK62BaiEY2wAn2uLRo0kImX_aSlwF6lzUh1dZ0,8937
+openepd/model/base.py,sha256=XGuXCWr0PTAeewQj8u75OcRWFumFP2wiSdJsrsL_ZGI,9959
 openepd/model/category.py,sha256=IQXNGQFQmFZ_H9PRONloX_UOSf1sTMDq1rM1yz8JR0Y,1639
 openepd/model/common.py,sha256=aa_bfotPybPoYyzHtwj5E5X1T-fCEyznMfVUWvpUhiM,5460
 openepd/model/epd.py,sha256=_PyVM3cKrOBS2vgLLPBZzKkNfiBEtp2rECP0imp49bc,14082
@@ -52,14 +52,14 @@ openepd/model/specs/generated/bulk_materials.py,sha256=otVwnI8N5zCs-JqklykdQDena
 openepd/model/specs/generated/cast_decks_and_underlayment.py,sha256=qZjryfTZc1ltPUkut7pkITb-wwZmBZWGIfUl1p8FNXs,955
 openepd/model/specs/generated/cladding.py,sha256=bdHmLyAWdp0Altjxm2vrrQ6N1KXpZSTwrRtUeO_IDds,6562
 openepd/model/specs/generated/cmu.py,sha256=Vv-aiT4Q7Zl5XTkSCnTeGOpE_ufTy63zt2Z5aXbv_Qo,1794
-openepd/model/specs/generated/common.py,sha256=1cACMUmr44kXBI2igvuLsl4v10FIzsUSsGTlEz85T90,900
+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_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=orwUcMQLiA8eHEglUPw-LGIHpYVv7uypPZyl95serqc,58329
-openepd/model/specs/generated/finishes.py,sha256=CfOpikGK6EJLDSUyshp0hmXT9yC2Xy6FKihThMjJVHI,21121
+openepd/model/specs/generated/enums.py,sha256=JaQZFGrGLPxz_J8t5VcSszM8HgmqHaIxqg9-nqFnv_k,58504
+openepd/model/specs/generated/finishes.py,sha256=QHFtUZcUCGAzZeHJlLoG1D9SxAW9FGPj7g48Fu1Nvdc,21660
 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
@@ -78,16 +78,16 @@ openepd/model/specs/generated/sheathing.py,sha256=06Y9Dy7_9Iy3VfA6fQGr6AUq30u1K_
 openepd/model/specs/generated/steel.py,sha256=nqkGivvAg5rll2NhClhKE6UCORsvPaVgHiuhirKP3Js,9901
 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=cTx9vqw3gklsWBuJ0jCOTJc9oOBTZF5M05R7saah9kY,6539
-openepd/model/specs/generated/wood_joists.py,sha256=KHFhVgbYy3idredDrCA0_0lrfeqG8hGPoEQfgaTWuMk,1862
+openepd/model/specs/generated/wood.py,sha256=RMNoPRS9K3XF2aXCbvRN3awpO23_5ugYhRCrnvCvI20,6341
+openepd/model/specs/generated/wood_joists.py,sha256=IWDRZ6OvZq6jaqjndK1Ge6H0vrQutAEgdbvcVJb-Ybw,1730
 openepd/model/standard.py,sha256=QhGpWN3U27fDcS0Yy1Dk8ElJfD0etet6i_PzoTD6B48,1318
 openepd/model/validation/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/model/validation/common.py,sha256=FLYqK8gYFagx08LCkS0jy3qo4-Zq9VAv5i8ZwF2svkc,2435
 openepd/model/validation/numbers.py,sha256=tgirqrDGgrSo6APGlW1ozNuVV8mJz_4HCAXS2OUENq0,888
-openepd/model/validation/quantity.py,sha256=j1s2G0vVePveeCzHOqz2W0CicPfZgWzFdg4ZFC5OmGA,7306
+openepd/model/validation/quantity.py,sha256=kzug0MZ3Ao0zeVzN-aleyxUg5hA_7D5tNOOerverfRQ,7415
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-4.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-4.0.0.dist-info/METADATA,sha256=UA4MKE056z9tXOIVSuemeI-6qd11JCLvYjSnWbiP3LA,7790
-openepd-4.0.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-4.0.0.dist-info/RECORD,,
+openepd-4.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-4.2.0.dist-info/METADATA,sha256=S2oqtKvw4rDM-N5a9NDPrD0AVRPknspcRFuufvz48YM,7790
+openepd-4.2.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-4.2.0.dist-info/RECORD,,