openepd 5.0.0__tar.gz → 5.1.1__tar.gz

{openepd-5.0.0 → openepd-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 5.0.0
+Version: 5.1.1
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -170,6 +170,11 @@ codes, UN m49 codification, and special regions. To update the enums, first upda
 Windows is not supported for development. You can use WSL2 with Ubuntu 20.04 or higher.
 Instructions are the same as for regular GNU/Linux installation.
 
+### Commit messages
+
+Commit messages should follow [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/#specification) 
+specification as we use automatic version with [commitizen](https://commitizen-tools.github.io/commitizen/).
+
 # Credits
 
 This library has been written and maintained by [C-Change Labs](https://c-change-labs.com/).

{openepd-5.0.0 → openepd-5.1.1}/README.md

@@ -143,6 +143,11 @@ codes, UN m49 codification, and special regions. To update the enums, first upda
 Windows is not supported for development. You can use WSL2 with Ubuntu 20.04 or higher.
 Instructions are the same as for regular GNU/Linux installation.
 
+### Commit messages
+
+Commit messages should follow [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/#specification) 
+specification as we use automatic version with [commitizen](https://commitizen-tools.github.io/commitizen/).
+
 # Credits
 
 This library has been written and maintained by [C-Change Labs](https://c-change-labs.com/).

{openepd-5.0.0 → openepd-5.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "5.0.0"
+version = "5.1.1"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]
@@ -38,6 +38,7 @@ pytest-subtests = "~=0.4"
 pytest-cov = "~=4.0"
 teamcity-messages = ">=1.31"
 wheel = "~=0.40.0"
+click = "~=8.1.7"
 
 # Dev tools
 black = "~=24.3"
@@ -58,7 +59,7 @@ types-requests = ">=2.0"
 # Code generation
 # For list of countries
 pycountry = ">=24.6.1"
-jinja2 = ">=2.10.3"
+jinja2 = ">=3.1.4"
 
 
 [tool.poetry.extras]

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/__version__.py

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

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/common.py

@@ -150,3 +150,42 @@ class OpenEPDUnit(StrEnum):
     degree_c = "°C"
     kg_co2 = "kgCO2e"
     hour = "hour"
+
+
+class RangeBase(BaseOpenEpdSchema):
+    """Base class for range types having min and max and order between them."""
+
+    @pyd.root_validator
+    def _validate_range_bounds(cls, values: dict[str, Any]) -> dict[str, Any]:
+        min_boundary = values.get("min")
+        max_boundary = values.get("max")
+        if min_boundary is not None and max_boundary is not None and min_boundary > max_boundary:
+            raise ValueError("Max should be greater than min")
+        return values
+
+
+class RangeFloat(RangeBase):
+    """Structure representing a range of floats."""
+
+    min: float | None = pyd.Field(default=None, example=3.1)
+    max: float | None = pyd.Field(default=None, example=5.8)
+
+
+class RangeInt(RangeBase):
+    """Structure representing a range of ints1."""
+
+    min: int | None = pyd.Field(default=None, example=2)
+    max: int | None = pyd.Field(default=None, example=3)
+
+
+class RangeRatioFloat(RangeFloat):
+    """Range of ratios (0-1 to 0-10)."""
+
+    min: float | None = pyd.Field(default=None, example=0.2, ge=0, le=1)
+    max: float | None = pyd.Field(default=None, example=0.65, ge=0, le=1)
+
+
+class RangeAmount(RangeFloat):
+    """Structure representing a range of quantities."""
+
+    unit: str | None = pyd.Field(default=None, description="Unit of the range.")

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/declaration.py

@@ -22,6 +22,7 @@ from openepd.model.common import Amount
 from openepd.model.geography import Geography
 from openepd.model.org import Org
 from openepd.model.pcr import Pcr
+from openepd.model.specs.range import SpecsRange
 from openepd.model.standard import Standard
 from openepd.model.validation.common import ReferenceStr
 from openepd.model.validation.quantity import AmountGWP, AmountMass
@@ -141,14 +142,14 @@ class BaseDeclaration(RootDocument, abc.ABC):
         description="Mass of elemental carbon, per declared unit, contained in the product itself at the manufacturing "
         "facility gate.  Used (among other things) to check a carbon balance or calculate incineration "
         "emissions.  The source of carbon (e.g. biogenic) is not relevant in this field.",
-        example=Amount(qty=8.76, unit="kgCO2e"),
+        example=Amount(qty=8.76, unit="kgCO2e").to_serializable(exclude_unset=True),
     )
     kg_C_biogenic_per_declared_unit: AmountGWP | None = pyd.Field(
         default=None,
         description="Mass of elemental carbon from biogenic sources, per declared unit, contained in the product "
         "itself at the manufacturing facility gate.  It may be presumed that any biogenic carbon content "
         "has been accounted for as -44/12 kgCO2e per kg C in stages A1-A3, per EN15804 and ISO 21930.",
-        example=Amount(qty=8.76, unit="kgCO2e"),
+        example=Amount(qty=8.76, unit="kgCO2e").to_serializable(exclude_unset=True),
     )
     product_service_life_years: float | None = pyd.Field(
         gt=0.0009,
@@ -173,6 +174,10 @@ class AverageDatasetMixin(pyd.BaseModel, title="Average Dataset"):
         "implies global applicability.",
     )
 
+    specs: SpecsRange | None = pyd.Field(
+        default=None, description="Average dataset material performance specifications."
+    )
+
 
 class WithProgramOperatorMixin(pyd.BaseModel):
     """Object which has a connection to ProgramOperator."""

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/geography.py

@@ -279,7 +279,7 @@ class Geography(StrEnum):
      * ZM: Zambia
      * ZW: Zimbabwe
 
-    USA and Canada subdivisions, see https://en.wikipedia.org/wiki/ISO_3166-1:
+    USA states and Canada provinces, see https://en.wikipedia.org/wiki/ISO_3166-1:
 
      * CA-AB: Alberta, Canada
      * CA-BC: British Columbia, Canada

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/lcia.py

@@ -681,12 +681,15 @@ class WithLciaMixin(BaseOpenEpdSchema):
     """Mixin for LCIA data."""
 
     impacts: Impacts | None = pyd.Field(
-        description="List of environmental impacts, compiled per one of the standard Impact Assessment methods"
+        description="List of environmental impacts, compiled per one of the standard Impact Assessment methods",
+        example={"TRACI 2.1": {"gwp": {"A1A2A3": {"mean": 22.4, "unit": "kgCO2e"}}}},
     )
     resource_uses: ResourceUseSet | None = pyd.Field(
-        description="Set of Resource Use Indicators, over various LCA scopes"
+        description="Set of Resource Use Indicators, over various LCA scopes",
+        example={"RPRe": {"A1A2A3": {"mean": 12, "unit": "MJ", "rsd": 0.12}}},
     )
     output_flows: OutputFlowSet | None = pyd.Field(
         description="Set of Waste and Output Flow indicators which describe the waste categories "
-        "and other material output flows derived from the LCI."
+        "and other material output flows derived from the LCI.",
+        example={"hwd": {"A1A2A3": {"mean": 2300, "unit": "kg", "rsd": 0.22}}},
     )

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/org.py

@@ -69,7 +69,6 @@ class Plant(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
         description="Plus code (aka Open Location Code) of plant's location and "
         "owner's web domain joined with `.`(dot).",
         example="865P2W3V+3W.interface.com",
-        alias="pluscode",
         default=None,
     )
     owner: Org | None = pyd.Field(description="Organization that owns the plant", default=None)

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/pcr.py

@@ -91,12 +91,12 @@ class Pcr(WithAttachmentsMixin, WithAltIdsMixin, BaseOpenEpdSchema):
         default=None,
     )
     date_of_issue: datetime.datetime | None = pyd.Field(
-        example=datetime.date(day=11, month=2, year=2022),
+        example=datetime.datetime(day=11, month=9, year=2019, tzinfo=datetime.timezone.utc),
         default=None,
         description="First day on which the document is valid",
     )
     valid_until: datetime.datetime | None = pyd.Field(
-        example=datetime.date(day=11, month=2, year=2024),
+        example=datetime.datetime(day=11, month=9, year=2019, tzinfo=datetime.timezone.utc),
         default=None,
         description="Last day on which the document is valid",
     )

openepd-5.1.1/src/openepd/model/specs/README.md

@@ -0,0 +1,45 @@
+# Material Extensions
+
+This package contains openEPD material extensions. They are used to represent the material properties of the openEPD
+materials, and are a more dynamic, frequently changing part of the standard.
+
+## Versioning
+
+Extensions are versioned separately from the openEPD standard or openEPD API.
+
+Each material extension is named after the corresponding EC3 product class, and is located in the relevant place
+in the specs tree. For example, `RebarSteel` is nested under `Steel`.
+
+Extensions are versioned as Major.Minor, for example "2.4".
+
+Rules:
+
+1. Minor versions for the same major version should be backwards compatible.
+2. Major versions are not compatible between themselves.
+3. Pydantic models representing versions are named in a pattern SpecNameV1, where 1 is major version and SpecName is
+   the name of the material extension.
+
+## Range specs
+
+Normal EPDs get singular specs (e.g. `SteelV1`). Single specs can express performance parameters of one concrete
+material/EPD. However, the IndustryEDPs and Generic Estimates often cover a specific segment of the market, and
+include a range of products under the hood, thus demanding for ranges. For example, a single EPD has one `strength_28d`
+of `4000 psi`, but an industry EPD can be applicable to certain concretes in the range of `4000 psi` to `5000 psi`.
+
+Range specs are used to express that. Range specs are located in `specs.range` package, and are auto-generated from the
+single specs, please see `make codegen` command and `tools/openepd/codegen/generate_range_spec_models.py`
+
+Range specs are created by following general rules:
+
+1. A QuantityStr (such as `QuantityMassKg`) becomes an `AmountRange` of certain type - `AmountRangeMass`
+2. Float -> RangeFloat, Ratio -> RatioRange, int -> IntRange
+3. Enums become lists of enums, for example: `cable_trays_material: enums.CableTrayMaterial` in normal spec becomes a
+   `cable_trays_material: list[enums.CabeTrayMaterial]` in the range spec.
+4. Complex objects, strings remain unchanged.
+
+This is, however, not always desired. For example, `recarbonation: float` and `recarbonation_z: float` property of CMU
+should not be converted to ranges as these do not make sense.
+
+The default rule-base behaviour can be overridden with the
+`CodeGenSpec` class annotation like this: `recarbonation: Annotated[float, CodeGenSpec(override_type=float)]` in single
+spec to make RangeSpec have normal `float` type.

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/asphalt.py

@@ -19,7 +19,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import OpenEPDUnit
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, TemperatureCStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, TemperatureCStr, validate_quantity_unit_factory
 
 
 class AsphaltMixType(StrEnum):
@@ -79,5 +79,5 @@ class AsphaltV1(BaseOpenEpdHierarchicalSpec):
     asphalt_pmb: bool | None = pyd.Field(default=None, description="Polymer modified bitumen (PMB)")
 
     _aggregate_size_max_validator = pyd.validator("asphalt_aggregate_size_max", allow_reuse=True)(
-        validate_unit_factory(OpenEPDUnit.m)
+        validate_quantity_unit_factory(OpenEPDUnit.m)
     )

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/base.py

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+import dataclasses
 from typing import Any
 
 from openepd.compat.pydantic import pyd
@@ -51,3 +52,15 @@ class BaseOpenEpdHierarchicalSpec(BaseOpenEpdSpec, WithExtVersionMixin):
 def setup_external_validators(quantity_validator: QuantityValidator):
     """Set the implementation unit validator for specs."""
     ExternalValidationConfig.QUANTITY_VALIDATOR = quantity_validator
+
+
+@dataclasses.dataclass(kw_only=True)
+class CodegenSpec:
+    """
+    Specification for codegen when generating RangeSpecs from normal specs.
+
+    See openepd.mode.specs.README.md for details.
+    """
+
+    exclude_from_codegen: bool = False
+    override_type: type

openepd-5.1.1/src/openepd/model/specs/generated/__init__.py

@@ -0,0 +1,95 @@
+#
+#  Copyright 2024 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.generated.accessories import AccessoriesV1
+from openepd.model.specs.generated.aggregates import AggregatesV1
+from openepd.model.specs.generated.aluminium import AluminiumV1
+from openepd.model.specs.generated.asphalt import AsphaltV1
+from openepd.model.specs.generated.bulk_materials import BulkMaterialsV1
+from openepd.model.specs.generated.cast_decks_and_underlayment import CastDecksAndUnderlaymentV1
+from openepd.model.specs.generated.cladding import CladdingV1
+from openepd.model.specs.generated.cmu import CMUV1
+from openepd.model.specs.generated.concrete import ConcreteV1
+from openepd.model.specs.generated.conveying_equipment import ConveyingEquipmentV1
+from openepd.model.specs.generated.electrical import ElectricalV1
+from openepd.model.specs.generated.electrical_transmission_and_distribution_equipment import (
+    ElectricalTransmissionAndDistributionEquipmentV1,
+)
+from openepd.model.specs.generated.electricity import ElectricityV1
+from openepd.model.specs.generated.finishes import FinishesV1
+from openepd.model.specs.generated.fire_and_smoke_protection import FireAndSmokeProtectionV1
+from openepd.model.specs.generated.furnishings import FurnishingsV1
+from openepd.model.specs.generated.grouting import GroutingV1
+from openepd.model.specs.generated.manufacturing_inputs import ManufacturingInputsV1
+from openepd.model.specs.generated.masonry import MasonryV1
+from openepd.model.specs.generated.material_handling import MaterialHandlingV1
+from openepd.model.specs.generated.mechanical import MechanicalV1
+from openepd.model.specs.generated.mechanical_insulation import MechanicalInsulationV1
+from openepd.model.specs.generated.network_infrastructure import NetworkInfrastructureV1
+from openepd.model.specs.generated.openings import OpeningsV1
+from openepd.model.specs.generated.other_electrical_equipment import OtherElectricalEquipmentV1
+from openepd.model.specs.generated.other_materials import OtherMaterialsV1
+from openepd.model.specs.generated.plumbing import PlumbingV1
+from openepd.model.specs.generated.precast_concrete import PrecastConcreteV1
+from openepd.model.specs.generated.sheathing import SheathingV1
+from openepd.model.specs.generated.steel import SteelV1
+from openepd.model.specs.generated.thermal_moisture_protection import ThermalMoistureProtectionV1
+from openepd.model.specs.generated.utility_piping import UtilityPipingV1
+from openepd.model.specs.generated.wood import WoodV1
+from openepd.model.specs.generated.wood_joists import WoodJoistsV1
+
+
+class Specs(BaseOpenEpdHierarchicalSpec):
+    """Material specific specs."""
+
+    _EXT_VERSION = "1.0"
+
+    # Nested specs:
+    CMU: CMUV1 | None = None
+    Masonry: MasonryV1 | None = None
+    Steel: SteelV1 | None = None
+    NetworkInfrastructure: NetworkInfrastructureV1 | None = None
+    Finishes: FinishesV1 | None = None
+    ManufacturingInputs: ManufacturingInputsV1 | None = None
+    Accessories: AccessoriesV1 | None = None
+    ElectricalTransmissionAndDistributionEquipment: ElectricalTransmissionAndDistributionEquipmentV1 | None = None
+    Aggregates: AggregatesV1 | None = None
+    ThermalMoistureProtection: ThermalMoistureProtectionV1 | None = None
+    Mechanical: MechanicalV1 | None = None
+    Aluminium: AluminiumV1 | None = None
+    Cladding: CladdingV1 | None = None
+    FireAndSmokeProtection: FireAndSmokeProtectionV1 | None = None
+    PrecastConcrete: PrecastConcreteV1 | None = None
+    Asphalt: AsphaltV1 | None = None
+    OtherMaterials: OtherMaterialsV1 | None = None
+    Plumbing: PlumbingV1 | None = None
+    Electrical: ElectricalV1 | None = None
+    UtilityPiping: UtilityPipingV1 | None = None
+    BulkMaterials: BulkMaterialsV1 | None = None
+    CastDecksAndUnderlayment: CastDecksAndUnderlaymentV1 | None = None
+    Concrete: ConcreteV1 | None = None
+    Sheathing: SheathingV1 | None = None
+    Furnishings: FurnishingsV1 | None = None
+    Wood: WoodV1 | None = None
+    ConveyingEquipment: ConveyingEquipmentV1 | None = None
+    MaterialHandling: MaterialHandlingV1 | None = None
+    Openings: OpeningsV1 | None = None
+    Electricity: ElectricityV1 | None = None
+    Grouting: GroutingV1 | None = None
+    MechanicalInsulation: MechanicalInsulationV1 | None = None
+    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = None
+    WoodJoists: WoodJoistsV1 | None = None

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/cladding.py

@@ -16,7 +16,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.generated.enums import CladdingFacingMaterial, CladdingInsulatingMaterial, SidingFormFactor
-from openepd.model.validation.quantity import LengthMmStr, LengthMStr, RValueStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, LengthMStr, RValueStr, validate_quantity_unit_factory
 
 
 class AluminiumSidingV1(BaseOpenEpdHierarchicalSpec):
@@ -75,7 +75,7 @@ class InsulatedVinylSidingV1(BaseOpenEpdHierarchicalSpec):
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="1 mm")
 
     _vinyl_siding_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_unit_factory("m")
+        validate_quantity_unit_factory("m")
     )
 
 
@@ -109,7 +109,7 @@ class VinylSidingV1(BaseOpenEpdHierarchicalSpec):
     thickness: LengthMmStr | None = pyd.Field(default=None, description="", example="5 mm")
 
     _vinyl_siding_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_unit_factory("m")
+        validate_quantity_unit_factory("m")
     )
 
 
@@ -191,7 +191,7 @@ class CladdingV1(BaseOpenEpdHierarchicalSpec):
     thickness: LengthMStr | None = pyd.Field(default=None, description="", example="10 mm")
     facing_material: CladdingFacingMaterial | None = pyd.Field(default=None, description="", example="Steel")
 
-    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_unit_factory("m"))
+    _thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(validate_quantity_unit_factory("m"))
 
     # Nested specs:
     Siding: SidingV1 | None = None

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/concrete.py

@@ -13,10 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from typing import Literal
+from typing import Annotated, Literal
 
 from openepd.compat.pydantic import pyd
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
 from openepd.model.specs.concrete import Cementitious, ConcreteTypicalApplication
 from openepd.model.specs.generated.enums import AciExposureClass, CsaExposureClass, EnExposureClass
 from openepd.model.validation.numbers import RatioFloat
@@ -25,7 +25,7 @@ from openepd.model.validation.quantity import (
     LengthMmStr,
     MassKgStr,
     PressureMPaStr,
-    validate_unit_factory,
+    validate_quantity_unit_factory,
 )
 
 
@@ -53,7 +53,7 @@ class ConcretePavingV1(BaseOpenEpdHierarchicalSpec):
     )
 
     _concrete_flexion_strength_is_quantity_validator = pyd.validator("flexion_strength", allow_reuse=True)(
-        validate_unit_factory("MPa")
+        validate_quantity_unit_factory("MPa")
     )
 
 
@@ -119,9 +119,10 @@ class ConcreteV1(BaseOpenEpdHierarchicalSpec):
         description="A strength spec which is to be reached later other 28 days (e.g. 42d)",
         example="30 MPa",
     )
-    strength_other_d: Literal[3, 7, 14, 42, 56, 72, 96, 120] | None = pyd.Field(
-        default=None, description="Test Day for strength_other", example=42
-    )
+    strength_other_d: Annotated[
+        Literal[3, 7, 14, 42, 56, 72, 96, 120] | None,
+        CodegenSpec(override_type=Literal[3, 7, 14, 42, 56, 72, 96, 120]),
+    ] = pyd.Field(default=None, description="Test Day for strength_other", example=42)
 
     slump: LengthInchStr | None = pyd.Field(default=None, description="", example="2 in")
     min_slump: LengthInchStr | None = pyd.Field(default=None, description="Minimum test slump", example="2 in")

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/electrical.py

@@ -26,7 +26,7 @@ from openepd.model.validation.quantity import (
     PowerStr,
     validate_quantity_ge_factory,
     validate_quantity_le_factory,
-    validate_unit_factory,
+    validate_quantity_unit_factory,
 )
 
 
@@ -268,7 +268,7 @@ class LightingV1(BaseOpenEpdHierarchicalSpec):
         validate_quantity_le_factory("1E+04 K")
     )
     _typical_utilization_unit_validator = pyd.validator("typical_utilization", allow_reuse=True)(
-        validate_unit_factory("h / yr")
+        validate_quantity_unit_factory("h / yr")
     )
     _typical_utilization_quantity_ge_validator = pyd.validator("typical_utilization", allow_reuse=True)(
         validate_quantity_ge_factory("25 h / yr")

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/finishes.py

@@ -52,7 +52,7 @@ from openepd.model.validation.quantity import (
     PressureMPaStr,
     validate_quantity_ge_factory,
     validate_quantity_le_factory,
-    validate_unit_factory,
+    validate_quantity_unit_factory,
 )
 
 
@@ -85,10 +85,10 @@ class AccessFlooringV1(BaseOpenEpdHierarchicalSpec):
 
     _access_flooring_rolling_load_10_pass_is_quantity_validator = pyd.validator(
         "rolling_load_10_pass", allow_reuse=True
-    )(validate_unit_factory("N"))
+    )(validate_quantity_unit_factory("N"))
     _access_flooring_rolling_load_10000_pass_is_quantity_validator = pyd.validator(
         "rolling_load_10000_pass", allow_reuse=True
-    )(validate_unit_factory("N"))
+    )(validate_quantity_unit_factory("N"))
 
 
 class CarpetV1(BaseOpenEpdHierarchicalSpec):
@@ -114,7 +114,9 @@ class CarpetV1(BaseOpenEpdHierarchicalSpec):
     gwp_factor_base: GwpKgCo2eStr | None = pyd.Field(default=None, description="", example="1 kgCO2e")
     gwp_factor_yarn: GwpKgCo2eStr | None = pyd.Field(default=None, description="", example="1 kgCO2e")
 
-    _yarn_weight_is_quantity_validator = pyd.validator("yarn_weight", allow_reuse=True)(validate_unit_factory("g / m2"))
+    _yarn_weight_is_quantity_validator = pyd.validator("yarn_weight", allow_reuse=True)(
+        validate_quantity_unit_factory("g / m2")
+    )
     _yarn_weight_ge_validator = pyd.validator("yarn_weight", allow_reuse=True)(validate_quantity_ge_factory("0 g / m2"))
 
 
@@ -348,7 +350,7 @@ class CementBoardV1(BaseOpenEpdHierarchicalSpec):
     )
 
     _cement_board_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_unit_factory("m")
+        validate_quantity_unit_factory("m")
     )
 
 
@@ -456,7 +458,9 @@ class GypsumV1(BaseOpenEpdHierarchicalSpec):
     moisture_resistant: bool | None = pyd.Field(default=None, description="", example=True)
     abuse_resistant: bool | None = pyd.Field(default=None, description="", example=True)
 
-    _gypsum_r_factor_is_quantity_validator = pyd.validator("r_factor", allow_reuse=True)(validate_unit_factory("RSI"))
+    _gypsum_r_factor_is_quantity_validator = pyd.validator("r_factor", allow_reuse=True)(
+        validate_quantity_unit_factory("RSI")
+    )
 
     # Nested specs:
     GypsumSupports: GypsumSupportsV1 | None = None

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/masonry.py

@@ -15,7 +15,11 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.validation.quantity import PressureMPaStr, validate_quantity_ge_factory, validate_unit_factory
+from openepd.model.validation.quantity import (
+    PressureMPaStr,
+    validate_quantity_ge_factory,
+    validate_quantity_unit_factory,
+)
 
 
 class GMUV1(BaseOpenEpdHierarchicalSpec):
@@ -35,7 +39,7 @@ class AutoclavedAeratedConcreteV1(BaseOpenEpdHierarchicalSpec):
     white: bool | None = pyd.Field(default=None, description="", example=True)
 
     _aac_thermal_conductivity_is_quantity_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(
-        validate_unit_factory("W / (m * K)")
+        validate_quantity_unit_factory("W / (m * K)")
     )
 
     _aac_thermal_conductivity_min_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/network_infrastructure.py

@@ -28,7 +28,12 @@ from openepd.model.specs.generated.enums import (
     RackType,
 )
 from openepd.model.specs.generated.mixins.conduit_mixin import ConduitMixin
-from openepd.model.validation.quantity import ElectricalCurrentStr, LengthMmStr, MassKgStr, validate_unit_factory
+from openepd.model.validation.quantity import (
+    ElectricalCurrentStr,
+    LengthMmStr,
+    MassKgStr,
+    validate_quantity_unit_factory,
+)
 
 
 class PDUV1(BaseOpenEpdHierarchicalSpec):
@@ -43,7 +48,7 @@ class PDUV1(BaseOpenEpdHierarchicalSpec):
     pdu_technology: PduTechnology | None = pyd.Field(default=None, description="", example="Basic")
     pdu_outlets: int | None = pyd.Field(default=None, description="", example=3, le=200)
 
-    _amperage_is_quantity_validator = pyd.validator("amperage", allow_reuse=True)(validate_unit_factory("A"))
+    _amperage_is_quantity_validator = pyd.validator("amperage", allow_reuse=True)(validate_quantity_unit_factory("A"))
 
 
 class CabinetsRacksAndEnclosuresV1(BaseOpenEpdHierarchicalSpec):

{openepd-5.0.0 → openepd-5.1.1}/src/openepd/model/specs/generated/openings.py

@@ -26,7 +26,7 @@ from openepd.model.specs.generated.enums import (
     ThermalSeparation,
 )
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, SpeedStr, validate_unit_factory
+from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, SpeedStr, validate_quantity_unit_factory
 
 
 class GlazingIntendedApplication(BaseOpenEpdSchema):
@@ -197,7 +197,7 @@ class FlatGlassPanesV1(BaseOpenEpdHierarchicalSpec):
     thickness: FlatGlassPanesThickness | None = pyd.Field(default=None, example="12 mm")
 
     _flat_glass_panes_thickness_is_quantity_validator = pyd.validator("thickness", allow_reuse=True)(
-        validate_unit_factory("m")
+        validate_quantity_unit_factory("m")
     )
 
 
@@ -380,10 +380,10 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
     )
 
     _assembly_u_factor_is_quantity_validator = pyd.validator("assembly_u_factor", allow_reuse=True)(
-        validate_unit_factory("USI")
+        validate_quantity_unit_factory("USI")
     )
     _nafs_performance_grade_is_quantity_validator = pyd.validator("performance_grade", allow_reuse=True)(
-        validate_unit_factory("psf")
+        validate_quantity_unit_factory("psf")
     )
 
     # Nested specs:
@@ -424,8 +424,12 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
         default=None, description="Spacer material for Integrated Glass Unit.", example="Aluminium"
     )
 
-    _dp_rating_is_quantity_validator = pyd.validator("dp_rating", allow_reuse=True)(validate_unit_factory("MPa"))
-    _cog_u_factor_is_quantity_validator = pyd.validator("cog_u_factor", allow_reuse=True)(validate_unit_factory("USI"))
+    _dp_rating_is_quantity_validator = pyd.validator("dp_rating", allow_reuse=True)(
+        validate_quantity_unit_factory("MPa")
+    )
+    _cog_u_factor_is_quantity_validator = pyd.validator("cog_u_factor", allow_reuse=True)(
+        validate_quantity_unit_factory("USI")
+    )
 
 
 class CurtainWallsV1(BaseOpenEpdHierarchicalSpec):