openepd 4.1.0__tar.gz → 4.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 4.1.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.1.0 → openepd-4.2.0}/pyproject.toml

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

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

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

{openepd-4.1.0 → openepd-4.2.0}/src/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-4.1.0 → openepd-4.2.0}/src/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-4.1.0 → openepd-4.2.0}/src/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 (
@@ -179,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):
@@ -425,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)

{openepd-4.1.0 → openepd-4.2.0}/src/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-4.1.0 → openepd-4.2.0}/src/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)