openepd 1.5.0__py3-none-any.whl → 1.6.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.5.0"
+VERSION = "1.6.0"

openepd/model/base.py

@@ -20,7 +20,7 @@
 import abc
 from enum import StrEnum
 import json
-from typing import Any, Generic, Optional, Type, TypeVar
+from typing import Any, Callable, Generic, Optional, Type, TypeVar
 
 import pydantic as pyd
 from pydantic.generics import GenericModel
@@ -41,6 +41,22 @@ class OpenEpdDoctypes(StrEnum):
     Epd = "openEPD"
 
 
+def modify_pydantic_schema(schema_dict: dict, cls: type) -> dict:
+    """
+    Modify the schema dictionary to add the required fields.
+
+    :param schema_dict: schema dictionary
+    :param cls: class for which the schema was generated
+    :return: modified schema dictionary
+    """
+    ext = schema_dict.get("properties", {}).get("ext")
+    # move to bottom
+    if ext is not None:
+        del schema_dict["properties"]["ext"]
+        schema_dict["properties"]["ext"] = ext
+    return schema_dict
+
+
 class BaseOpenEpdSchema(pyd.BaseModel):
     """Base class for all OpenEPD models."""
 
@@ -51,6 +67,7 @@ class BaseOpenEpdSchema(pyd.BaseModel):
         validate_assignment = False
         allow_population_by_field_name = True
         use_enum_values = True
+        schema_extra: Callable | dict = modify_pydantic_schema
 
     def to_serializable(self, *args, **kwargs) -> dict[str, Any]:
         """

openepd/model/common.py

@@ -17,6 +17,7 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
+from enum import StrEnum
 from typing import Annotated, Any
 
 import pydantic as pyd
@@ -137,3 +138,18 @@ class WithAltIdsMixin(BaseModel):
         """Set an alt_id if value is not None."""
         if value is not None:
             self.set_alt_id(domain_name, value)
+
+
+class OpenEPDUnit(StrEnum):
+    """OpenEPD allowed units."""
+
+    kg = "kg"
+    m2 = "m2"
+    m = "m"
+    M2_RSI = "m2 * RSI"
+    MJ = "MJ"
+    t_km = "t * km"
+    MPa = "MPa"
+    item = "item"
+    W = "W"
+    use = "use"

openepd/model/org.py

@@ -25,8 +25,8 @@ from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.common import Location, WithAltIdsMixin, WithAttachmentsMixin
 
 
-class Org(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
-    """Represent an organization."""
+class OrgRef(BaseOpenEpdSchema):
+    """Represents Organisation with minimal data."""
 
     web_domain: str | None = pyd.Field(
         description="A web domain owned by organization. Typically is the org's home website address", default=None
@@ -37,12 +37,18 @@ class Org(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
         example="C Change Labs",
         default=None,
     )
+
+
+class Org(WithAttachmentsMixin, WithAltIdsMixin, OrgRef):
+    """Represent an organization."""
+
     alt_names: Annotated[list[str], pyd.conlist(pyd.constr(max_length=200), max_items=255)] | None = pyd.Field(
         description="List of other names for organization",
         example=["C-Change Labs", "C-Change Labs inc."],
         default=None,
     )
     # TODO: NEW field, not in the spec
+
     owner: Optional["Org"] = pyd.Field(description="Organization that controls this organization", default=None)
     subsidiaries: Annotated[list[str], pyd.conlist(pyd.constr(max_length=200), max_items=255)] | None = pyd.Field(
         description="Organizations controlled by this organization",

openepd/model/specs/__init__.py

@@ -17,6 +17,7 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
+
 import pydantic as pyd
 
 from openepd.model.base import BaseOpenEpdSchema
@@ -28,5 +29,7 @@ class Specs(BaseOpenEpdSchema):
 
     cmu: concrete.CmuSpec | None = pyd.Field(default=None, description="Concrete Masonry Unit-specific (CMU) specs")
     CMU: concrete.CmuSpec | None = pyd.Field(default=None, description="Concrete Masonry Unit-specific (CMU) specs")
-    Steel: steel.SteelV1 | None = pyd.Field(default=None, description="Steel-specific specs")
-    Concrete: concrete.ConcreteV1 | None = pyd.Field(default=None, description="Concrete-specific specs")
+    Steel: steel.SteelV1 | None = pyd.Field(default=None, title="SteelV1", description="Steel-specific specs")
+    Concrete: concrete.ConcreteV1 | None = pyd.Field(
+        default=None, title="ConcreteV1", description="Concrete-specific specs"
+    )

openepd/model/specs/base.py

@@ -23,6 +23,7 @@ import pydantic as pyd
 
 from openepd.model.base import BaseOpenEpdSchema, Version
 from openepd.model.validation.common import validate_version_compatibility, validate_version_format
+from openepd.model.validation.numbers import QuantityValidator
 from openepd.model.versioning import WithExtVersionMixin
 
 
@@ -36,6 +37,8 @@ class BaseOpenEpdSpec(BaseOpenEpdSchema):
 class BaseOpenEpdHierarchicalSpec(BaseOpenEpdSpec, WithExtVersionMixin):
     """Base class for new specs (hierarchical, versioned)."""
 
+    _QUANTITY_VALIDATOR: QuantityValidator | None = None
+
     def __init__(self, **data: Any) -> None:
         # ensure that all the concrete spec objects fail on creations if they dont have _EXT_VERSION declared to
         # something meaningful
@@ -50,3 +53,8 @@ class BaseOpenEpdHierarchicalSpec(BaseOpenEpdSpec, WithExtVersionMixin):
     _version_major_match_validator = pyd.validator("ext_version", allow_reuse=True, check_fields=False)(
         validate_version_compatibility("_EXT_VERSION")
     )
+
+
+def setup_external_validators(quantity_validator: QuantityValidator):
+    """Set the implementation unit validator for specs."""
+    BaseOpenEpdHierarchicalSpec._QUANTITY_VALIDATOR = quantity_validator

openepd/model/specs/concrete.py

@@ -23,9 +23,67 @@ from typing import Literal
 import pydantic as pyd
 
 from openepd.model.base import BaseOpenEpdSchema
+from openepd.model.common import OpenEPDUnit
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec
 from openepd.model.validation.common import together_validator
-from openepd.model.validation.numbers import RatioFloat
+from openepd.model.validation.numbers import RatioFloat, validate_unit_factory
+
+
+class AciExposureClass(StrEnum):
+    """ACI Code (US)."""
+
+    F0 = "aci.F0"
+    F1 = "aci.F1"
+    F2 = "aci.F2"
+    F3 = "aci.F3"
+    S0 = "aci.S0"
+    S1 = "aci.S1"
+    S2 = "aci.S2"
+    S3 = "aci.S3"
+    C1 = "aci.C1"
+    C2 = "aci.C2"
+    W0 = "aci.W0"
+    W1 = "aci.W1"
+    W2 = "aci.W2"
+
+
+class CsaExposureClass(StrEnum):
+    """CSA Code (Canada)."""
+
+    N = "csa.N"
+    F2 = "csa.F-2"
+    F_1 = "csa.F-1"
+    C_1 = "csa.C-1"
+    S_3 = "csa.S-3"
+    S_2 = "csa.S-2"
+    S_1 = "csa.S-1"
+    A_1 = "csa.A-1"
+    A_2 = "csa.A-2"
+    A_3 = "csa.A-3"
+    A_4 = "csa.A-4"
+
+
+class EnExposureClass(StrEnum):
+    """EN 206 Class (Europe)."""
+
+    en206_0 = "en206.0"
+    F1 = "en206.F1"
+    F2 = "en206.F2"
+    F3 = "en206.F3"
+    F4 = "en206.F4"
+    A1 = "en206.A1"
+    A2 = "en206.A2"
+    A3 = "en206.A3"
+    D1 = "en206.D1"
+    D2 = "en206.D2"
+    D3 = "en206.D3"
+    S1 = "en206.S1"
+    S2 = "en206.S2"
+    S3 = "en206.S3"
+    C1 = "en206.C1"
+    C2 = "en206.C2"
+    C3 = "en206.C3"
+    C4 = "en206.C4"
 
 
 class CmuWeightClassification(StrEnum):
@@ -157,16 +215,34 @@ class CmuSpec(BaseOpenEpdSpec):
 class Cementitious(BaseOpenEpdSchema):
     """List of cementitious materials, and proportion by mass."""
 
-    opc: RatioFloat | None = pyd.Field(default=None, title="Ordinary Gray Portland Cement")
-    wht: RatioFloat | None = pyd.Field(default=None, title="White Portland Cement")
-    ggbs: RatioFloat | None = pyd.Field(default=None, title="Ground Granulated Blast Furnace Slag")
-    flyAsh: RatioFloat | None = pyd.Field(default=None, title="Fly Ash, including types F, CL, and CH")
-    siFume: RatioFloat | None = pyd.Field(default=None, title="Silica Fume")
-    gg45: RatioFloat | None = pyd.Field(default=None, title="Ground Glass, 45um or smaller")
-    natPoz: RatioFloat | None = pyd.Field(default=None, title="Natural pozzolan")
-    mk: RatioFloat | None = pyd.Field(default=None, title="Metakaolin")
-    CaCO3: RatioFloat | None = pyd.Field(default=None, title="Limestone")
-    other: RatioFloat | None = pyd.Field(default=None, title="Other SCMs")
+    opc: RatioFloat | None = pyd.Field(default=None, description="Ordinary Gray Portland Cement")
+    wht: RatioFloat | None = pyd.Field(default=None, description="White Portland Cement")
+    ggbs: RatioFloat | None = pyd.Field(default=None, description="Ground Granulated Blast Furnace Slag")
+    flyAsh: RatioFloat | None = pyd.Field(default=None, description="Fly Ash, including types F, CL, and CH")
+    siFume: RatioFloat | None = pyd.Field(default=None, description="Silica Fume")
+    gg45: RatioFloat | None = pyd.Field(default=None, description="Ground Glass, 45um or smaller")
+    natPoz: RatioFloat | None = pyd.Field(default=None, description="Natural pozzolan")
+    mk: RatioFloat | None = pyd.Field(default=None, description="Metakaolin")
+    CaCO3: RatioFloat | None = pyd.Field(default=None, description="Limestone")
+    other: RatioFloat | None = pyd.Field(default=None, description="Other SCMs")
+
+
+class TypicalApplication(BaseOpenEpdSchema):
+    """Concrete typical application."""
+
+    fnd: bool | None = pyd.Field(description="Foundation", default=None)
+    sog: bool | None = pyd.Field(description="Slab on Grade", default=None)
+    hrz: bool | None = pyd.Field(description="Elevated Horizontal", default=None)
+    vrt_wall: bool | None = pyd.Field(description="Vertical Wall", default=None)
+    vrt_column: bool | None = pyd.Field(description="Vertical Column", default=None)
+    vrt_other: bool | None = pyd.Field(description="Vertical Other", default=None)
+    sht: bool | None = pyd.Field(description="Shotcrete", default=None)
+    cdf: bool | None = pyd.Field(description="Flowable Fill (CDF,default=None)", default=None)
+    sac: bool | None = pyd.Field(description="Sidewalk and Curb", default=None)
+    pav: bool | None = pyd.Field(description="Paving", default=None)
+    oil: bool | None = pyd.Field(description="Oil Patch", default=None)
+    grt: bool | None = pyd.Field(description="Cement Grout", default=None)
+    ota: bool | None = pyd.Field(description="Other", default=None)
 
 
 class ConcreteV1(BaseOpenEpdHierarchicalSpec):
@@ -174,6 +250,16 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.0"
 
+    class Options(BaseOpenEpdSchema):
+        lightweight: bool | None = pyd.Field(description="Lightweight", default=None)
+        plc: bool | None = pyd.Field(description="Portland Limestone Cement", default=None)
+        scc: bool | None = pyd.Field(description="Self Compacting", default=None)
+        finishable: bool | None = pyd.Field(description="Finishable", default=None)
+        air: bool | None = pyd.Field(description="Air Entrainment", default=None)
+        co2: bool | None = pyd.Field(description="CO2 Curing", default=None)
+        white: bool | None = pyd.Field(description="White Cement", default=None)
+        fiber_reinforced: bool | None = pyd.Field(description="Fiber reinforced", default=None)
+
     strength_28d: str | None = pyd.Field(
         default=None, title="Concrete Strength 28d", description="Concrete strength after 28 days"
     )
@@ -194,11 +280,30 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
     strength_late_d: Literal[42, 56, 72, 96, 120] | None = pyd.Field(
         default=None, title="Test Day for the Late Strength", description="Test Day for the Late Strength"
     )
+    slump: str | None = pyd.Field(description="Minimum test slump", default=None)
+    w_c_ratio: RatioFloat | None = pyd.Field(description="Ratio of water to cement", default=None)
+    aci_exposure_classes: list[AciExposureClass] = pyd.Field(
+        description="List of ACI318-19 exposure classes this product meets", default=None
+    )
+    csa_exposure_classes: list[CsaExposureClass] = pyd.Field(
+        description="List of CSA A23.1 exposure classes this product meets", default=None
+    )
+    en_exposure_classes: list[EnExposureClass] = pyd.Field(
+        description="List of EN206 exposure classes this product meets", default=None
+    )
+
+    application: TypicalApplication | None = pyd.Field(description="Typical Application", default=None)
+
+    options: Options = pyd.Field(description="Concrete options", default=None)
+
     cementitious: Cementitious | None = pyd.Field(
         default=None,
         title="Cementitious Materials",
         description="List of cementitious materials, and proportion by mass",
     )
+    _compressive_strength_unit_validator = pyd.validator("strength_28d", allow_reuse=True)(
+        validate_unit_factory(OpenEPDUnit.MPa)
+    )
 
     @pyd.root_validator
     def _late_validator(cls, values):

openepd/model/specs/steel.py

@@ -23,15 +23,16 @@ import pydantic as pyd
 
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.standard import Standard
 from openepd.model.validation.numbers import RatioFloat
 
 
 class SteelMakingRoute(BaseOpenEpdSchema):
     """Steel making route."""
 
-    bof: bool | None = pyd.Field(default=None, title="Steel Making Route BOF", description="Basic oxygen furnace")
-    eaf: bool | None = pyd.Field(default=None, title="Steel Making Route EAF", description="Electric arc furnace")
-    ohf: bool | None = pyd.Field(default=None, title="Steel Making Route OHF", description="Open hearth furnace")
+    bof: bool | None = pyd.Field(default=None, description="Basic oxygen furnace")
+    eaf: bool | None = pyd.Field(default=None, description="Electric arc furnace")
+    ohf: bool | None = pyd.Field(default=None, description="Open hearth furnace")
 
 
 class SteelComposition(StrEnum):
@@ -44,20 +45,67 @@ class SteelComposition(StrEnum):
     OTHER = "Other"
 
 
+class FabricatedOptionsMixin(pyd.BaseModel):
+    """Fabricated options mixin."""
+
+    fabricated: bool | None = pyd.Field(default=None, description="Fabricated")
+
+
+class WireMeshSteelV1(BaseOpenEpdHierarchicalSpec):
+    """Spec for wire mesh steel."""
+
+    class Options(BaseOpenEpdSchema, FabricatedOptionsMixin):
+        """Wire Mesh Options."""
+
+        pass
+
+    options: Options = pyd.Field(description="Rebar Steel options", default_factory=Options)
+
+
 class RebarSteelV1(BaseOpenEpdHierarchicalSpec):
     """Rebar steel spec."""
 
     _EXT_VERSION = "1.0"
 
-    class Options(BaseOpenEpdSchema):
-        """Rebar steel options."""
+    class Options(BaseOpenEpdSchema, FabricatedOptionsMixin):
+        """Rebar Steel Options."""
 
-        epoxy: bool | None = pyd.Field(default=None, title="Epoxy Coated")
-        fabricated: bool | None = pyd.Field(default=None, title="Fabricated", description="Fabricated")
+        epoxy: bool | None = pyd.Field(default=None, description="Epoxy Coated")
 
-    options: Options = pyd.Field(
-        title="Rebar Steel Options", description="Rebar Steel options", default_factory=Options
-    )
+    options: Options = pyd.Field(description="Rebar Steel options", default_factory=Options)
+
+
+class PlateSteelV1(BaseOpenEpdHierarchicalSpec):
+    """Plate Steel Spec."""
+
+    class Options(BaseOpenEpdSchema, FabricatedOptionsMixin):
+        """Plate Steel Options."""
+
+        pass
+
+    options: Options = pyd.Field(description="Plate Steel options", default_factory=Options)
+
+
+class HollowV1(BaseOpenEpdHierarchicalSpec):
+    """Hollow Sections Spec."""
+
+    class Options(FabricatedOptionsMixin, BaseOpenEpdSchema):
+        """Hollow Sections Options."""
+
+        pass
+
+    options: Options = pyd.Field(description="Hollow Steel options", default_factory=Options)
+
+
+class HotRolledV1(BaseOpenEpdHierarchicalSpec):
+    """Hot Rolled spec."""
+
+    class Options(FabricatedOptionsMixin, BaseOpenEpdSchema):
+        """Hot Rolled options."""
+
+        pass
+
+    options: Options = pyd.Field(description="Hollow Steel options", default_factory=Options)
 
 
 class SteelV1(BaseOpenEpdHierarchicalSpec):
@@ -68,24 +116,31 @@ class SteelV1(BaseOpenEpdHierarchicalSpec):
     class Options(BaseOpenEpdSchema):
         """Steel spec options."""
 
-        galvanized: bool | None = pyd.Field(default=None, title="Galvanized")
-        cold_finished: bool | None = pyd.Field(default=None, title="Cold Finished")
+        galvanized: bool | None = pyd.Field(default=None, description="Galvanized")
+        cold_finished: bool | None = pyd.Field(default=None, description="Cold Finished")
 
+    form_factor: str | None = pyd.Field(description="Product's form factor", example="Steel >> RebarSteel")
+    steel_composition: SteelComposition | None = pyd.Field(default=None, description="Basic chemical composition")
     recycled_content: RatioFloat | None = pyd.Field(
         default=None,
-        title="Scrap Recycled Content",
         description="Scrap steel inputs from other processes.  Includes "
         "Post-Consumer content, if any.  This percentage may be "
         "used to evaluate the EPD w.r.t. targets or limits that are"
         " different for primary and recycled content.",
     )
-    steel_composition: SteelComposition | None = pyd.Field(
-        default=None, title="Steel Composition", description="Basic chemical composition"
-    )
-    making_route: SteelMakingRoute | None = pyd.Field(
-        default=None, title="Steel Making Route", description="Steel making route"
+    ASTM: list[Standard] = pyd.Field(description="ASTM standard to which this product complies", default_factory=list)
+    SAE: list[Standard] = pyd.Field(
+        description="AISA/SAE standard to which this product complies", default_factory=list
     )
+    EN: list[Standard] = pyd.Field(description="EN 10027 number(s)", default_factory=list)
+
     options: Options | None = pyd.Field(description="Steel options", default_factory=Options)
+    making_route: SteelMakingRoute | None = pyd.Field(default=None, description="Steel making route")
 
     # Nested specs
+
+    WireMeshSteel: WireMeshSteelV1 | None = None
     RebarSteel: RebarSteelV1 | None = None
+    PlateSteel: PlateSteelV1 | None = None
+    Hollow: HollowV1 | None = None
+    HotRolled: HotRolledV1 | None = None

openepd/model/validation/numbers.py

@@ -17,9 +17,50 @@
 #  Charles Pankow Foundation, Microsoft Sustainability Fund, Interface, MKA Foundation, and others.
 #  Find out more at www.BuildingTransparency.org
 #
-from typing import Annotated
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Annotated
 
 import pydantic as pyd
 
+from openepd.model.common import OpenEPDUnit
+
+if TYPE_CHECKING:
+    from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+
 RatioFloat = Annotated[float, pyd.Field(ge=0, le=1, example=0.5)]
 """Float field which represents a percentage ratio between 0 and 1."""
+
+
+class QuantityValidator(ABC):
+    """
+    Interface for quantity validator.
+
+    The openEPD models are mapped using the simple types. Caller code should provide their own implementation of this
+    and set it with `set_unit_validator` function.
+    """
+
+    @abstractmethod
+    def validate(self, value: str, dimensionality: str) -> None:
+        """
+        Validate the given string value against the given dimensionality.
+
+        Args:
+            value: The value to validate, like "102.4 kg"
+            dimensionality: The dimensionality to validate against, like "kg"
+        Returns:
+            None if the value is valid, raises an error otherwise.
+        Raises:
+            ValueError: If the value is not valid.
+        """
+        pass
+
+
+def validate_unit_factory(dimensionality: OpenEPDUnit | str):
+    """Create validator for unit field."""
+
+    def validator(cls: "BaseOpenEpdHierarchicalSpec", value: str) -> str:
+        if hasattr(cls, "_QUNATITY_VALIDATOR") and cls._QUANTITY_VALIDATOR is not None:
+            cls._QUANTITY_VALIDATOR.validate(value, dimensionality)
+        return value
+
+    return validator

openepd/model/versioning.py

@@ -37,7 +37,7 @@ class WithExtVersionMixin(ABC, BaseModel):
         if hasattr(cls, "_EXT_VERSION"):
             cls.__fields__["ext_version"].default = cls._EXT_VERSION
 
-    ext_version: str = pyd.Field(title="Extension version", example="3.22", default=None)
+    ext_version: str = pyd.Field(description="Extension version", example="3.22", default=None)
 
 
 class Version(NamedTuple):

{openepd-1.5.0.dist-info → openepd-1.6.0.dist-info}/METADATA

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

{openepd-1.5.0.dist-info → openepd-1.6.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
-openepd/__version__.py,sha256=39xThneFQ4W_HcH1Mw2OPiRHanB4Qxl2McAEAZ_HV6w,855
+openepd/__version__.py,sha256=dydPFQzMC85AwH6lLCuy1P3UT2PsGjNSUOyDiyVRnhA,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
@@ -27,26 +27,26 @@ openepd/bundle/model.py,sha256=NWbpxorLzQ_OIFozV34wz76OWM_ORGTBkS0288chv0k,2647
 openepd/bundle/reader.py,sha256=z4v_UWyaosktN3DdmnRx8GpLq4DkejjoUsckFfCgUac,6904
 openepd/bundle/writer.py,sha256=AfvzzdAr9ybIbtiZfuX2mAGfddamTxXxUTxtHHrs2Gc,8353
 openepd/model/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
-openepd/model/base.py,sha256=rR86DJ2x94mHaVwNf8wcD5Z7l8BLo2oS16gQaS9AI4s,8310
+openepd/model/base.py,sha256=wLZUQSc6nOvoiESgxjEHTdGEV417SUolsXMNm2mA-po,8883
 openepd/model/category.py,sha256=_6yFyldaDrkZk2_9ZAO2oRTz7ocvkg4T-D_aw5ncgvo,1840
-openepd/model/common.py,sha256=SSTIvCjCkJEKf3FVnUvAw9SfFbkSdestq6YBX20eBQw,5386
+openepd/model/common.py,sha256=j-M_2T_Kl_Ea8l50pJT7LNatBW1fKrRcw4XNpeNvLU0,5635
 openepd/model/epd.py,sha256=BxcKJd_LuApB2v_LGN0-hYLNaUNoqMu9ZH_V1Ffil-g,14269
 openepd/model/factory.py,sha256=qQZNb4yFN1EQWHHVS-fHnJ2gB-vsKz9hVmXXJE7YaRU,1918
 openepd/model/lcia.py,sha256=2GOdcY6ASJu653SFwTakT9boYF-3CYCHLupyxTPUQ30,16711
-openepd/model/org.py,sha256=ov3nrSk36imug7ADarNWHIXW9jiFbmboswoXVQCNeDI,3662
+openepd/model/org.py,sha256=quoYMrA6WXqs7ZRjdO1Bm47No4jGLqxz0QmnnqKgw7c,3741
 openepd/model/pcr.py,sha256=t861yFntmy3ewrnGLP47cv3afV-aCCVRlrbpGeRh-7I,4604
 openepd/model/specs/README.md,sha256=W5LSMpZuW5x36cKS4HRfeFsClsRf8J9yHMMICghdc0s,862
-openepd/model/specs/__init__.py,sha256=iyubvilvNaoL7Olh1pM8RxZstfFM2tQdJvWdQ3FuzMA,1462
-openepd/model/specs/base.py,sha256=pbSE_RBDKiVarhM7wTUP4bGmAuHtKrF-DRMzvlHqYok,2239
-openepd/model/specs/concrete.py,sha256=wZUfpYAjX0zNew719AKo0gfqxHq9qnZFkWTsB48Tbxw,9232
-openepd/model/specs/steel.py,sha256=4azufmyD_h2HIIVJEc_mw6i3Fv-DdWVTOI5rzQ3Raxo,3325
+openepd/model/specs/__init__.py,sha256=3DXyeFzH1bw4rf1KCFXPXl3X-ErMu0NpjvqqhorpnLc,1514
+openepd/model/specs/base.py,sha256=hOE_hCuiY7xhR0yW_Pbxe_LQAnMWq8sq3rTqQqbeVOc,2564
+openepd/model/specs/concrete.py,sha256=jdhuThy8QFaEs9HdJ53O7ua4Fw-ES2_YzoLDchyU8s0,13165
+openepd/model/specs/steel.py,sha256=FoMYE6y_uvWg9Edkb7WV0f_hQNmviwtI1SM-UmdRh8E,4985
 openepd/model/standard.py,sha256=YjxpC9nyz6LM8m3z1s5S0exJ1qvA3n59-FBoScg-FL0,1519
 openepd/model/validation/__init__.py,sha256=rqQJWF5jpYAgRbbAycUfWMGsr5kGtfjmwzsTeqbElJw,837
 openepd/model/validation/common.py,sha256=nNwLtj5Uu7TsFmJXuD8aRcx1hB_nf-LQBfEvHOZM1Ao,2420
-openepd/model/validation/numbers.py,sha256=YIJFcw1oXQC7MzHKBk1Z9vkfkWhxnndoX8YH5bY5qR4,1028
-openepd/model/versioning.py,sha256=tJ4XNuV8vO3Aa6WqRpVfG258tX_9nDIZfMjqjoMyy2M,4622
+openepd/model/validation/numbers.py,sha256=AItjDAz9LODxLOH7shqfMMufT9ep_8ys2bVelIbME7g,2349
+openepd/model/versioning.py,sha256=Z31TgCW0POsmXLrH-Rmpy-MrIw_bU_9wwh8T4Mq1yTM,4628
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-1.5.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-1.5.0.dist-info/METADATA,sha256=96X-W4zaXleOzdJZECfbcijqJvgaYO8ZsPTwxLuTOq8,7762
-openepd-1.5.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-1.5.0.dist-info/RECORD,,
+openepd-1.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-1.6.0.dist-info/METADATA,sha256=_zIXgd030Dco2ykLRwhes7xe6ygQhgmtjiyEXqVvUo0,7762
+openepd-1.6.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-1.6.0.dist-info/RECORD,,