openepd 1.8.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

openepd/__version__.py

@@ -17,4 +17,4 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-VERSION = "1.8.0"
+VERSION = "1.9.0"

openepd/model/specs/concrete.py

@@ -372,7 +372,7 @@ class ConcreteV1Options(BaseOpenEpdSchema):
 class ReadyMixV1(BaseOpenEpdHierarchicalSpec):
     """Concretes to be mixed and then poured on-site."""
 
-    pass
+    _EXT_VERSION = "1.0"
 
 
 class FlowableFillV1(BaseOpenEpdHierarchicalSpec):
@@ -387,7 +387,7 @@ class FlowableFillV1(BaseOpenEpdHierarchicalSpec):
     under 1200 psi.
     """
 
-    pass
+    _EXT_VERSION = "1.0"
 
 
 class OilPatchV1(BaseOpenEpdHierarchicalSpec):
@@ -398,19 +398,19 @@ class OilPatchV1(BaseOpenEpdHierarchicalSpec):
     flowable fill and grout in that it contains no sand or other aggregates.
     """
 
-    pass
+    _EXT_VERSION = "1.0"
 
 
 class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
     """Concrete paving."""
 
-    pass
+    _EXT_VERSION = "1.0"
 
 
 class ShotcreteV1(BaseOpenEpdHierarchicalSpec):
     """Concretes sprayed on a target."""
 
-    pass
+    _EXT_VERSION = "1.0"
 
 
 class CementGroutV1(BaseOpenEpdHierarchicalSpec):
@@ -423,6 +423,8 @@ class CementGroutV1(BaseOpenEpdHierarchicalSpec):
 
     """
 
+    _EXT_VERSION = "1.0"
+
 
 class ConcreteV1(BaseOpenEpdHierarchicalSpec):
     """Concrete spec."""

openepd/model/specs/glass.py

@@ -21,12 +21,13 @@ from enum import StrEnum
 
 import pydantic as pyd
 
+from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import PositiveInt, RatioFloat
 from openepd.model.validation.quantity import HeatConductanceUCIStr, LengthMmStr, PressureMPaStr, QuantityStr
 
 
-class SolarHeatGainMixin(BaseOpenEpdHierarchicalSpec):
+class SolarHeatGainMixin(BaseOpenEpdSchema):
     """Solar heat gain mixin."""
 
     solar_heat_gain: RatioFloat | None = pyd.Field(
@@ -38,7 +39,7 @@ class SolarHeatGainMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class GlazingOptionsMixin(BaseOpenEpdHierarchicalSpec):
+class GlazingOptionsMixin(BaseOpenEpdSchema):
     """Glazing options mixin."""
 
     low_emissivity: bool | None = pyd.Field(default=None, description="Low Emissivity coatings")
@@ -80,7 +81,7 @@ class GlazingOptionsMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class GlassPanesMixin(BaseOpenEpdHierarchicalSpec):
+class GlassPanesMixin(BaseOpenEpdSchema):
     """Glass panes mixin."""
 
     glass_panes: PositiveInt | None = pyd.Field(
@@ -90,7 +91,7 @@ class GlassPanesMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class DPRatingMixin(BaseOpenEpdHierarchicalSpec):
+class DPRatingMixin(BaseOpenEpdSchema):
     """Differential pressure rating mixin."""
 
     dp_rating: PressureMPaStr | None = pyd.Field(
@@ -98,7 +99,7 @@ class DPRatingMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class AirInfiltrationMixin(BaseOpenEpdHierarchicalSpec):
+class AirInfiltrationMixin(BaseOpenEpdSchema):
     """Air infiltration mixin."""
 
     air_infiltration: QuantityStr | None = pyd.Field(
@@ -108,7 +109,7 @@ class AirInfiltrationMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class AssemblyUFactorMixin(BaseOpenEpdHierarchicalSpec):
+class AssemblyUFactorMixin(BaseOpenEpdSchema):
     """Assembly U factor mixin."""
 
     assembly_u_factor: HeatConductanceUCIStr | None = pyd.Field(
@@ -118,7 +119,7 @@ class AssemblyUFactorMixin(BaseOpenEpdHierarchicalSpec):
     )
 
 
-class GlassIntendedApplicationMixin(BaseOpenEpdHierarchicalSpec):
+class GlassIntendedApplicationMixin(BaseOpenEpdSchema):
     """Glass intended application mixin."""
 
     glazing_intended_application_curtain_wall: bool | None = pyd.Field(
@@ -165,13 +166,13 @@ class ThermalSeparationEnum(StrEnum):
     NON_METAL = "Nonmetal"
 
 
-class ThermalSeparationMixin(BaseOpenEpdHierarchicalSpec):
+class ThermalSeparationMixin(BaseOpenEpdSchema):
     """Thermal separation mixin."""
 
     thermal_separation: ThermalSeparationEnum | None = pyd.Field(default=None, description="Thermal separation.")
 
 
-class HurricaneResistantMixin(BaseOpenEpdHierarchicalSpec):
+class HurricaneResistantMixin(BaseOpenEpdSchema):
     """Hurricane resistant mixin."""
 
     hurricane_resistant: bool | None = pyd.Field(

openepd/model/specs/steel.py

@@ -50,12 +50,16 @@ class SteelComposition(StrEnum):
 class FabricatedOptionsMixin(pyd.BaseModel):
     """Fabricated options mixin."""
 
+    _EXT_VERSION = "1.0"
+
     fabricated: bool | None = pyd.Field(default=None, description="Fabricated")
 
 
 class WireMeshSteelV1(BaseOpenEpdHierarchicalSpec):
     """Spec for wire mesh steel."""
 
+    _EXT_VERSION = "1.0"
+
     class Options(BaseOpenEpdSchema, FabricatedOptionsMixin):
         """Wire Mesh Options."""
 
@@ -115,6 +119,8 @@ class RebarSteelV1(BaseOpenEpdHierarchicalSpec):
 class PlateSteelV1(BaseOpenEpdHierarchicalSpec):
     """Plate Steel Spec."""
 
+    _EXT_VERSION = "1.0"
+
     class Options(BaseOpenEpdSchema, FabricatedOptionsMixin):
         """Plate Steel Options."""
 
@@ -126,6 +132,8 @@ class PlateSteelV1(BaseOpenEpdHierarchicalSpec):
 class HollowV1(BaseOpenEpdHierarchicalSpec):
     """Hollow Sections Spec."""
 
+    _EXT_VERSION = "1.0"
+
     class Options(FabricatedOptionsMixin, BaseOpenEpdSchema):
         """Hollow Sections Options."""
 
@@ -137,6 +145,8 @@ class HollowV1(BaseOpenEpdHierarchicalSpec):
 class HotRolledV1(BaseOpenEpdHierarchicalSpec):
     """Hot Rolled spec."""
 
+    _EXT_VERSION = "1.0"
+
     class Options(FabricatedOptionsMixin, BaseOpenEpdSchema):
         """Hot Rolled options."""
 

openepd/model/validation/quantity.py

@@ -69,7 +69,9 @@ def validate_unit_factory(dimensionality: OpenEPDUnit | str):
 # for abitrary non-standard quantity
 QuantityStr: TypeAlias = Annotated[str, pyd.Field()]
 PressureMPaStr: TypeAlias = Annotated[str, pyd.Field(example="30 MPa")]
+MassKgStr: TypeAlias = Annotated[str, pyd.Field(example="30 kg")]
 LengthMmStr: TypeAlias = Annotated[str, pyd.Field(example="30 mm")]
+AreaM2Str: TypeAlias = Annotated[str, pyd.Field(example="12 m2")]
 LengthMStr: TypeAlias = Annotated[str, pyd.Field(example="30 m")]
 TemperatureCStr: TypeAlias = Annotated[str, pyd.Field(example="45 C")]
 HeatConductanceUCIStr: TypeAlias = Annotated[str, pyd.Field(example="0.3 U")]

{openepd-1.8.0.dist-info → openepd-1.9.0.dist-info}/METADATA

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

{openepd-1.8.0.dist-info → openepd-1.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
-openepd/__version__.py,sha256=6YlL51CiEXjMXGC4aYqdXMGp923puMgij54LxJ2lhek,855
+openepd/__version__.py,sha256=jnF1KQQH-oe7r7Nthg1ws4gaTnagjiXOX84RVcGM0XA,855
 openepd/api/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
 openepd/api/base_sync_client.py,sha256=JcNpWsGoIK_1Eg27CAQd7nIjbcfD56jQ1nS6B48Q0cI,21142
 openepd/api/category/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
@@ -40,18 +40,18 @@ openepd/model/specs/__init__.py,sha256=nNs2nu1DIKyFC2A-Wc6Zk2VguSti3bC0gMpjop692
 openepd/model/specs/aluminium.py,sha256=UqTX1gigGNgR9jWi4TEM-bKVGlZ_MBkdsLx4H1-H7KA,2246
 openepd/model/specs/asphalt.py,sha256=lBHTultMZqWXe9u-inGzcZRBkvW6axFZ10REZv-OBys,3533
 openepd/model/specs/base.py,sha256=S2KmHpBjjZnJ67FS3VJBA3aQ0a440OmhFFTqM8ZEOMM,2681
-openepd/model/specs/concrete.py,sha256=Hu6PxoyfRAeDGInMfHayOc8FZc8w5FS3tUCKxdBpOxM,23097
-openepd/model/specs/glass.py,sha256=Zn8cKTGxhoQujtv4F7HtfMkZugV5DMt_HQ6dw0sUugs,14865
-openepd/model/specs/steel.py,sha256=n9hnOwJ8ZixVdd9M-R_wHego35qWinGe8W184EwHASo,6334
+openepd/model/specs/concrete.py,sha256=I5_KVLkHeMvOrdJRY3TOeSVQ9lQZXcaLu0zHP1RJO1M,23203
+openepd/model/specs/glass.py,sha256=gsqTTylaDZTi1U1GQDvmIV08m3h-1uq3iQIm1rvWpJI,14824
+openepd/model/specs/steel.py,sha256=u2Lyu69y0bewghfz3JcrKVjKc5bZJKAljA356_EKgWc,6464
 openepd/model/specs/wood.py,sha256=ehKJqqW9VfNKgM1S3gazfNNL4Af4SKZBm7HttAjokZQ,5128
 openepd/model/standard.py,sha256=YjxpC9nyz6LM8m3z1s5S0exJ1qvA3n59-FBoScg-FL0,1519
 openepd/model/validation/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
 openepd/model/validation/common.py,sha256=afJrWSvxMf8s9Y80-bG67Fp6W5siqtciMJ3Z6nUOPAI,2636
 openepd/model/validation/numbers.py,sha256=60Z9hT8nQwJHvUL7k5nBZsHxxWhaIxNKVbW3BnHS8zM,1088
-openepd/model/validation/quantity.py,sha256=-JGwdeSWuBSgtUizoSOg-6t3NFaGuumn5Ngd01rYxPs,2873
+openepd/model/validation/quantity.py,sha256=yYI-vJzhZTTMlHfZqZzxTgEziXp_WeIouIo7etntFfI,3005
 openepd/model/versioning.py,sha256=fpj45RmphEI5u9fKZLI8FWa83cjH-wkeIU1RLLLwmX8,4700
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-1.8.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-1.8.0.dist-info/METADATA,sha256=r3C2sR1Zz5kmEkaZQbnYg6LKvXK3HFidysHpUOPepcU,7762
-openepd-1.8.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-1.8.0.dist-info/RECORD,,
+openepd-1.9.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-1.9.0.dist-info/METADATA,sha256=RnFS7P2ijW63ly6LP2-dvJeYC07V1fh8dQwBoJVmf-k,7762
+openepd-1.9.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-1.9.0.dist-info/RECORD,,