openepd 5.1.0__py3-none-any.whl → 6.1.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 = "5.1.0"
+VERSION = "6.1.0"

openepd/api/average_dataset/generic_estimate_sync_api.py

@@ -21,7 +21,7 @@ from openepd.api.base_sync_client import BaseApiMethodGroup
 from openepd.api.common import StreamingListResponse, paging_meta_from_v1_api
 from openepd.api.dto.common import BaseMeta, OpenEpdApiResponse
 from openepd.api.dto.meta import PagingMetaMixin
-from openepd.api.utils import encode_path_param
+from openepd.api.utils import encode_path_param, remove_none_id_fields
 from openepd.model.generic_estimate import (
     GenericEstimate,
     GenericEstimatePreview,
@@ -61,7 +61,11 @@ class GenericEstimateApi(BaseApiMethodGroup):
     ) -> tuple[GenericEstimate, Response]: ...
 
     @overload
-    def post_with_refs(self, ge: GenericEstimateWithDeps, with_response: Literal[False] = False) -> GenericEstimate: ...
+    def post_with_refs(
+        self,
+        ge: GenericEstimateWithDeps,
+        with_response: Literal[False] = False,
+    ) -> GenericEstimate: ...
 
     def post_with_refs(
         self, ge: GenericEstimateWithDeps, with_response: bool = False
@@ -71,12 +75,16 @@ class GenericEstimateApi(BaseApiMethodGroup):
 
         :param ge: GenericEstimate
         :param with_response: return the response object togather with the GenericEstimate
+        :param exclude_defaults: If True, fields with default values are excluded from the payload
         :return: GenericEstimate alone, or GenericEstimate with HTTP Response object depending on parameter
         """
+        data = ge.to_serializable(exclude_unset=True, by_alias=True)
+        # Remove 'id' fields with None values, as 'id' cannot be None
+        data = remove_none_id_fields(data)
         response = self._client.do_request(
             "patch",
             "/generic_estimates/post_with_refs",
-            json=ge.to_serializable(exclude_unset=True, exclude_defaults=True, by_alias=True),
+            json=data,
         )
         content = response.json()
         if with_response:

openepd/api/epd/sync_api.py

@@ -20,7 +20,7 @@ from requests import Response
 from openepd.api.base_sync_client import BaseApiMethodGroup
 from openepd.api.common import StreamingListResponse
 from openepd.api.epd.dto import EpdSearchResponse, EpdStatisticsResponse, StatisticsDto
-from openepd.api.utils import encode_path_param
+from openepd.api.utils import encode_path_param, remove_none_id_fields
 from openepd.model.epd import Epd
 
 
@@ -117,12 +117,16 @@ class EpdApi(BaseApiMethodGroup):
 
         :param epd: EPD
         :param with_response: return the response object togather with the EPD
+        :param exclude_defaults: If True, fields with default values are excluded from the payload
         :return: EPD or EPD with HTTP Response object depending on parameter
         """
+        epd_data = epd.to_serializable(exclude_unset=True, by_alias=True)
+        # Remove 'id' fields with None values, as 'id' cannot be None
+        epd_data = remove_none_id_fields(epd_data)
         response = self._client.do_request(
             "patch",
             "/epds/post-with-refs",
-            json=epd.to_serializable(exclude_unset=True, exclude_defaults=True, by_alias=True),
+            json=epd_data,
         )
         content = response.json()
         if with_response:

openepd/api/utils.py

@@ -26,3 +26,43 @@ def encode_path_param(value: str) -> str:
     :return: encoded value
     """
     return quote(value, safe="")
+
+
+def remove_none_id_fields(d: dict) -> dict:
+    """
+    Remove any key 'id' with a None value from the dictionary, including nested dicts.
+
+    :param d: the dict which may contain 'id' keys with None values.
+    :return: a new dict with 'id' keys that have None values removed.
+
+    :note:
+        - This function does not modify the original dictionary (no side effects).
+        - It returns a new dictionary with the necessary modifications applied.
+
+    :example:
+        >>> data = {
+        ...     "id": None,
+        ...     "name": "item1",
+        ...     "details": {
+        ...         "id": None,
+        ...         "category": "tools",
+        ...         "nested": {
+        ...             "id": None,
+        ...             "value": 42
+        ...         }
+        ...     }
+        ... }
+        >>> remove_none_id_fields(data)
+        {'name': 'item1', 'details': {'category': 'tools', 'nested': {'value': 42}}}
+    """
+    if not isinstance(d, dict):
+        return d
+
+    cleaned_dict = {}
+    for k, v in d.items():
+        if isinstance(v, dict):
+            v = remove_none_id_fields(v)
+        if not (k == "id" and v is None):
+            cleaned_dict[k] = v
+
+    return cleaned_dict

openepd/bundle/model.py

@@ -13,6 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from datetime import datetime
 from enum import StrEnum
 
 from openepd.compat.pydantic import pyd
@@ -61,6 +62,8 @@ class BundleManifest(BaseOpenEpdSchema):
     """The generator of the bundle."""
     assets: BundleManifestAssetsStats = pyd.Field(default_factory=BundleManifestAssetsStats)
     comment: str | None = pyd.Field(default=None)
+    created_at: datetime = pyd.Field(default_factory=datetime.utcnow)
+    """The date and time when the bundle was generated."""
 
 
 class AssetInfo(BaseOpenEpdSchema):

openepd/model/common.py

@@ -18,6 +18,7 @@ from typing import Annotated, Any
 
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
+from openepd.model.validation.numbers import RatioFloat
 
 
 class Amount(BaseOpenEpdSchema):
@@ -38,6 +39,32 @@ class Amount(BaseOpenEpdSchema):
         return f"{self.qty or ''} {self.unit or 'str'}".strip()
 
 
+class Distribution(StrEnum):
+    """
+    Distribution of the measured value.
+
+     * log-normal: Probability distribution of any random parameter whose natural log is normally distributed (the
+       PDF is gaussian).
+     * normal: Probability distribution of any random parameter whose value is normally distributed around the mean
+       (the PDF is gaussian).
+     * Continuous uniform probability distribution between minimum value and maximum value and "0" probability beyond
+       these.
+     * Probability distribution of any random parameter between minimum value and maximum value with the highest
+       probability at the average value of minimum plus maximum value. Linear change of probability between minimum,
+       maximum and average value.
+     * Means Impact is not known, but with >95% certainty the true value is below the declared value.
+       So [1e-6,"kgCFC11e",0,"max"] means the ODP was not exactly measured, but it is guaranteed to be below
+       1E-6 kg CO2e.  It is acceptable to treat a 'max' distribution a normal or lognormal distribution with variation
+       0.1%.  This is conservative, because the 'max' value is usually much greater than the true impact.
+    """
+
+    LOG_NORMAL = "log-normal"
+    NORMAL = "normal"
+    UNIFORM = "uniform"
+    TRIANGULAR = "triangular"
+    MAX = "max"
+
+
 class Measurement(BaseOpenEpdSchema):
     """A scientific value with units and uncertainty."""
 
@@ -46,7 +73,15 @@ class Measurement(BaseOpenEpdSchema):
     rsd: pyd.PositiveFloat | None = pyd.Field(
         description="Relative standard deviation, i.e. standard_deviation/mean", default=None
     )
-    dist: str | None = pyd.Field(description="Statistical distribution of the measurement error.", default=None)
+    dist: Distribution | None = pyd.Field(
+        description="Statistical distribution of the measurement error.", default=None
+    )
+
+
+class IngredientEvidenceTypeEnum(StrEnum):
+    """Supported types of evidence for indirect ingredient."""
+
+    PRODUCT_EPD = "Product EPD"
 
 
 class Ingredient(BaseOpenEpdSchema):
@@ -56,6 +91,11 @@ class Ingredient(BaseOpenEpdSchema):
     The Ingredients list gives the core data references and quantities. This list is used to document supply-chain
     transparency, such as the EPDs of major components (e.g. cement in concrete, or recycled steel
     in hot-rolled sections).
+
+    Since the exact ingredients may be viewed as a proprietary information by Manufacturers, this schema also allows
+    to pass some data about ingredient about explicitly saying what it is. Further, this data can be used to
+    calculate the supply chain specificity of the product and uncertainty adjusted factor. For this option, use
+    gwp_fraction, citation and evidence_type.
     """
 
     qty: float | None = pyd.Field(
@@ -67,6 +107,16 @@ class Ingredient(BaseOpenEpdSchema):
         default=None,
     )
 
+    gwp_fraction: RatioFloat | None = pyd.Field(
+        default=None,
+        description="Fraction of product's A1-A3 GWP this flow represents.  This value, along with the specificity of "
+        "the reference, are used to caclulate supply chain specificity.",
+    )
+    evidence_type: IngredientEvidenceTypeEnum | None = pyd.Field(
+        default=None, description="Type of evidence used, which can be used to calculate degree of specificity"
+    )
+    citation: str | None = pyd.Field(default=None, description="Text citation describing the data source ")
+
 
 class LatLng(BaseOpenEpdSchema):
     """A latitude and longitude."""
@@ -189,3 +239,17 @@ class RangeAmount(RangeFloat):
     """Structure representing a range of quantities."""
 
     unit: str | None = pyd.Field(default=None, description="Unit of the range.")
+
+
+class EnumGroupingAware:
+    """
+    Mixin for enums to support groups.
+
+    With the groups, enum can group its values into more than one groups, so that the validator higher in code can check
+    for mutual exclusivity, for example that only one value from the group is permitted at the same time.
+    """
+
+    @classmethod
+    def get_groupings(cls) -> list[list]:
+        """Return logical groupings of the values."""
+        return []

openepd/model/epd.py

@@ -29,7 +29,7 @@ from openepd.model.declaration import (
 )
 from openepd.model.lcia import WithLciaMixin
 from openepd.model.org import Org, Plant
-from openepd.model.specs import Specs
+from openepd.model.specs.singular import Specs
 from openepd.model.versioning import OpenEpdVersions, Version
 
 MANUFACTURER_DESCRIPTION = (

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

@@ -14,80 +14,39 @@
 #  limitations under the License.
 #
 
-from openepd.model.base import BaseOpenEpdSchema
-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 (
+from openepd.model.specs.singular.accessories import AccessoriesV1
+from openepd.model.specs.singular.aggregates import AggregatesV1
+from openepd.model.specs.singular.aluminium import AluminiumV1
+from openepd.model.specs.singular.asphalt import AsphaltV1
+from openepd.model.specs.singular.bulk_materials import BulkMaterialsV1
+from openepd.model.specs.singular.cast_decks_and_underlayment import CastDecksAndUnderlaymentV1
+from openepd.model.specs.singular.cladding import CladdingV1
+from openepd.model.specs.singular.cmu import CMUV1
+from openepd.model.specs.singular.concrete import ConcreteV1
+from openepd.model.specs.singular.conveying_equipment import ConveyingEquipmentV1
+from openepd.model.specs.singular.electrical import ElectricalV1
+from openepd.model.specs.singular.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(BaseOpenEpdSchema):
-    """Material specific specs."""
-
-    # 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
+from openepd.model.specs.singular.electricity import ElectricityV1
+from openepd.model.specs.singular.finishes import FinishesV1
+from openepd.model.specs.singular.fire_and_smoke_protection import FireAndSmokeProtectionV1
+from openepd.model.specs.singular.furnishings import FurnishingsV1
+from openepd.model.specs.singular.grouting import GroutingV1
+from openepd.model.specs.singular.manufacturing_inputs import ManufacturingInputsV1
+from openepd.model.specs.singular.masonry import MasonryV1
+from openepd.model.specs.singular.material_handling import MaterialHandlingV1
+from openepd.model.specs.singular.mechanical import MechanicalV1
+from openepd.model.specs.singular.mechanical_insulation import MechanicalInsulationV1
+from openepd.model.specs.singular.network_infrastructure import NetworkInfrastructureV1
+from openepd.model.specs.singular.openings import OpeningsV1
+from openepd.model.specs.singular.other_electrical_equipment import OtherElectricalEquipmentV1
+from openepd.model.specs.singular.other_materials import OtherMaterialsV1
+from openepd.model.specs.singular.plumbing import PlumbingV1
+from openepd.model.specs.singular.precast_concrete import PrecastConcreteV1
+from openepd.model.specs.singular.sheathing import SheathingV1
+from openepd.model.specs.singular.steel import SteelV1
+from openepd.model.specs.singular.thermal_moisture_protection import ThermalMoistureProtectionV1
+from openepd.model.specs.singular.utility_piping import UtilityPipingV1
+from openepd.model.specs.singular.wood import WoodV1
+from openepd.model.specs.singular.wood_joists import WoodJoistsV1

openepd/model/specs/base.py

@@ -14,6 +14,7 @@
 #  limitations under the License.
 #
 import dataclasses
+from types import UnionType
 from typing import Any
 
 from openepd.compat.pydantic import pyd
@@ -63,4 +64,4 @@ class CodegenSpec:
     """
 
     exclude_from_codegen: bool = False
-    override_type: type
+    override_type: type | UnionType

openepd/model/specs/{generated/enums.py → enums.py}

@@ -15,6 +15,8 @@
 #
 from enum import StrEnum
 
+from openepd.model.common import EnumGroupingAware
+
 # Enums used
 
 
@@ -2182,7 +2184,7 @@ class FloorBoxFloorMaterial(StrEnum):
     OTHER = "Other"
 
 
-class AciExposureClass(StrEnum):
+class AciExposureClass(EnumGroupingAware, StrEnum):
     """
     American Concrete Institute concrete exposure classes.
 
@@ -2196,6 +2198,7 @@ class AciExposureClass(StrEnum):
       * `aci.S2` - Exposed to <10000 ppm of SO4 in water and <2% SO4 in soil
       * `aci.S3` - Exposed to >10000 ppm of SO4 in water or >2% SO4 in soil
 
+      * `aci.C0` - Concrete dry or protected from moisture.
       * `aci.C1` - Concrete in contact with moisture, but the external source of chloride does not reach it.
       * `aci.C2` - Concrete subjected to moisture and an external source of chlorides such as deicing chemicals,
                     salt, brackish water, seawater, or spray from these sources.
@@ -2212,14 +2215,25 @@ class AciExposureClass(StrEnum):
     S1 = "aci.S1"
     S2 = "aci.S2"
     S3 = "aci.S3"
+    C0 = "aci.C1"
     C1 = "aci.C1"
     C2 = "aci.C2"
     W0 = "aci.W0"
     W1 = "aci.W1"
     W2 = "aci.W2"
 
+    @classmethod
+    def get_groupings(cls) -> list[list]:
+        """Return logical groupings of the values."""
+        return [
+            [AciExposureClass.F0, AciExposureClass.F1, AciExposureClass.F2, AciExposureClass.F3],
+            [AciExposureClass.S0, AciExposureClass.S1, AciExposureClass.S2, AciExposureClass.S3],
+            [AciExposureClass.W0, AciExposureClass.W1],
+            [AciExposureClass.C0, AciExposureClass.C1, AciExposureClass.C2],
+        ]
+
 
-class CsaExposureClass(StrEnum):
+class CsaExposureClass(EnumGroupingAware, StrEnum):
     """
     Canadian Standard Association concrete exposure classes.
 
@@ -2286,8 +2300,20 @@ class CsaExposureClass(StrEnum):
     A_3 = "csa.A-3"
     A_4 = "csa.A-4"
 
+    @classmethod
+    def get_groupings(cls) -> list[list]:
+        """Return logical groupings of the values."""
+        return [
+            [CsaExposureClass.C_XL],
+            [CsaExposureClass.C_1, CsaExposureClass.C_2, CsaExposureClass.C_3, CsaExposureClass.C_4],
+            [CsaExposureClass.F_1, CsaExposureClass.F2],
+            [CsaExposureClass.N],
+            [CsaExposureClass.A_1, CsaExposureClass.A_2, CsaExposureClass.A_3, CsaExposureClass.A_4],
+            [CsaExposureClass.S_1, CsaExposureClass.S_2, CsaExposureClass.S_3],
+        ]
 
-class EnExposureClass(StrEnum):
+
+class EnExposureClass(EnumGroupingAware, StrEnum):
     """
     EN 206 Class (Europe).
 
@@ -2348,6 +2374,28 @@ class EnExposureClass(StrEnum):
     en206_XA2 = "en206.XA2"
     en206_XA3 = "en206.XA3"
 
+    @classmethod
+    def get_groupings(cls) -> list[list]:
+        """Return logical groupings of the values."""
+        return [
+            [EnExposureClass.en206_X0],
+            [
+                EnExposureClass.en206_XC1,
+                EnExposureClass.en206_XC2,
+                EnExposureClass.en206_XC3,
+                EnExposureClass.en206_XC4,
+            ],
+            [EnExposureClass.en206_XD1, EnExposureClass.en206_XD2, EnExposureClass.en206_XD3],
+            [EnExposureClass.en206_XS1, EnExposureClass.en206_XS2, EnExposureClass.en206_XS3],
+            [
+                EnExposureClass.en206_XF1,
+                EnExposureClass.en206_XF2,
+                EnExposureClass.en206_XF3,
+                EnExposureClass.en206_XF4,
+            ],
+            [EnExposureClass.en206_XA1, EnExposureClass.en206_XA2, EnExposureClass.en206_XA3],
+        ]
+
 
 class AggregateWeightClassification(StrEnum):
     """

openepd/model/specs/range/aggregates.py

@@ -21,8 +21,8 @@ __all__ = ("AggregatesRangeV1",)
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.aggregates import AggregateApplication
-from openepd.model.specs.generated.enums import AggregateGradation, AggregateWeightClassification
+from openepd.model.specs.enums import AggregateGradation, AggregateWeightClassification
+from openepd.model.specs.singular.aggregates import AggregateApplication
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 

openepd/model/specs/range/aluminium.py

@@ -26,7 +26,7 @@ __all__ = (
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AluminiumAlloy
+from openepd.model.specs.enums import AluminiumAlloy
 
 
 class AluminiumBilletsRangeV1(BaseOpenEpdHierarchicalSpec):

openepd/model/specs/range/asphalt.py

@@ -21,8 +21,8 @@ __all__ = ("AsphaltRangeV1",)
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AsphaltGradation, AsphaltMixType
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeTemperatureC
+from openepd.model.specs.enums import AsphaltGradation, AsphaltMixType
+from openepd.model.validation.quantity import AmountRangeLengthMm, TemperatureCStr
 
 
 class AsphaltRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -44,11 +44,11 @@ class AsphaltRangeV1(BaseOpenEpdHierarchicalSpec):
     ground_tire_rubber: RangeRatioFloat | None = pyd.Field(
         default=None, description="Percent of mixture that has been replaced by ground tire rubber (GTR)."
     )
-    max_temperature: AmountRangeTemperatureC | None = pyd.Field(
+    max_temperature: TemperatureCStr | None = pyd.Field(
         default=None,
         description="The upper threshold temperature to which an asphalt binder can be heated preventing the asphalt mixture from rutting",
     )
-    min_temperature: AmountRangeTemperatureC | None = pyd.Field(
+    min_temperature: TemperatureCStr | None = pyd.Field(
         default=None,
         description="The lower threshold temperature for an asphalt binder to prevent thermal cracking of the asphalt mixture.",
     )

openepd/model/specs/range/cladding.py

@@ -40,7 +40,7 @@ __all__ = (
 
 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.specs.enums import CladdingFacingMaterial, CladdingInsulatingMaterial, SidingFormFactor
 from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeRValue
 
 

openepd/model/specs/range/cmu.py

@@ -18,11 +18,12 @@ __all__ = ("CMURangeV1",)
 # NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
 
 
+from builtins import float
+
 from openepd.compat.pydantic import pyd
-from openepd.model.common import RangeFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import CmuBlockType, CmuWeightClassification
-from openepd.model.validation.quantity import AmountRangeGWP, AmountRangePressureMpa
+from openepd.model.specs.enums import CmuBlockType, CmuWeightClassification
+from openepd.model.validation.quantity import AmountRangePressureMpa, GwpKgCo2eStr
 
 
 class CMURangeV1(BaseOpenEpdHierarchicalSpec):
@@ -40,5 +41,5 @@ class CMURangeV1(BaseOpenEpdHierarchicalSpec):
     block_type: list[CmuBlockType] | None = pyd.Field(default=None, description="")
     insulated: bool | None = pyd.Field(default=None, description="")
     sound_performance: bool | None = pyd.Field(default=None, description="")
-    b1_recarbonation: AmountRangeGWP | None = pyd.Field(default=None, description="")
-    b1_recarbonation_z: RangeFloat | None = pyd.Field(default=None, description="")
+    b1_recarbonation: GwpKgCo2eStr | None = pyd.Field(default=None, description="")
+    b1_recarbonation_z: float | None = pyd.Field(default=None, description="")

openepd/model/specs/range/concrete.py

@@ -32,7 +32,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.concrete import Cementitious, ConcreteTypicalApplication
-from openepd.model.specs.generated.enums import AciExposureClass, CsaExposureClass, EnExposureClass
+from openepd.model.specs.enums import AciExposureClass, CsaExposureClass, EnExposureClass
 from openepd.model.validation.quantity import (
     AmountRangeLengthInch,
     AmountRangeLengthMm,

openepd/model/specs/range/conveying_equipment.py

@@ -24,7 +24,7 @@ __all__ = (
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import ElevatorsBuildingRise, ElevatorsUsageIntensity
+from openepd.model.specs.enums import ElevatorsBuildingRise, ElevatorsUsageIntensity
 from openepd.model.validation.quantity import (
     AmountRangeCapacityPerHour,
     AmountRangeLengthMm,

openepd/model/specs/range/electrical.py

@@ -51,13 +51,14 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import CableTraysMaterial, ConduitMaterial, EnergySource, RacewaysMaterial
+from openepd.model.specs.enums import CableTraysMaterial, ConduitMaterial, EnergySource, RacewaysMaterial
 from openepd.model.validation.quantity import (
     AmountRangeColorTemperature,
     AmountRangeLengthMm,
     AmountRangeLuminosity,
     AmountRangeMass,
     AmountRangePower,
+    AmountRangeUtilization,
 )
 
 
@@ -376,7 +377,7 @@ class LightingRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     color_temperature: AmountRangeColorTemperature | None = pyd.Field(default=None, description="")
-    typical_utilization: str | None = pyd.Field(default=None, description="")
+    typical_utilization: AmountRangeUtilization | None = pyd.Field(default=None, description="")
     luminosity: AmountRangeLuminosity | None = pyd.Field(default=None, description="")
     wattage: AmountRangePower | None = pyd.Field(default=None, description="")
     color_rendering_index: RangeFloat | None = pyd.Field(default=None, description="")