openepd 5.3.0__tar.gz → 6.0.1__tar.gz

{openepd-5.3.0 → openepd-6.0.1}/PKG-INFO

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

{openepd-5.3.0 → openepd-6.0.1}/pyproject.toml

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

{openepd-5.3.0 → openepd-6.0.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.3.0"
+VERSION = "6.0.1"

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/api/average_dataset/generic_estimate_sync_api.py

@@ -57,16 +57,18 @@ class GenericEstimateApi(BaseApiMethodGroup):
 
     @overload
     def post_with_refs(
-        self, ge: GenericEstimateWithDeps, with_response: Literal[True], exclude_defaults: bool = True
+        self, ge: GenericEstimateWithDeps, with_response: Literal[True]
     ) -> tuple[GenericEstimate, Response]: ...
 
     @overload
     def post_with_refs(
-        self, ge: GenericEstimateWithDeps, with_response: Literal[False] = False, exclude_defaults: bool = True
+        self,
+        ge: GenericEstimateWithDeps,
+        with_response: Literal[False] = False,
     ) -> GenericEstimate: ...
 
     def post_with_refs(
-        self, ge: GenericEstimateWithDeps, with_response: bool = False, exclude_defaults: bool = True
+        self, ge: GenericEstimateWithDeps, with_response: bool = False
     ) -> GenericEstimate | tuple[GenericEstimate, Response]:
         """
         Post an GenericEstimate with references.
@@ -76,10 +78,9 @@ class GenericEstimateApi(BaseApiMethodGroup):
         :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, exclude_defaults=exclude_defaults, by_alias=True)
-        if exclude_defaults is False:
-            # Remove 'id' fields with None values, as 'id' cannot be None
-            data = remove_none_id_fields(data)
+        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",

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/api/epd/sync_api.py

@@ -106,16 +106,12 @@ class EpdApi(BaseApiMethodGroup):
         return self.get_statistics_raw(omf).payload
 
     @overload
-    def post_with_refs(
-        self, epd: Epd, with_response: Literal[True], exclude_defaults: bool = True
-    ) -> tuple[Epd, Response]: ...
+    def post_with_refs(self, epd: Epd, with_response: Literal[True]) -> tuple[Epd, Response]: ...
 
     @overload
-    def post_with_refs(self, epd: Epd, with_response: Literal[False] = False, exclude_defaults: bool = True) -> Epd: ...
+    def post_with_refs(self, epd: Epd, with_response: Literal[False] = False) -> Epd: ...
 
-    def post_with_refs(
-        self, epd: Epd, with_response: bool = False, exclude_defaults: bool = True
-    ) -> Epd | tuple[Epd, Response]:
+    def post_with_refs(self, epd: Epd, with_response: bool = False) -> Epd | tuple[Epd, Response]:
         """
         Post an EPD with references.
 
@@ -124,10 +120,9 @@ class EpdApi(BaseApiMethodGroup):
         :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, exclude_defaults=exclude_defaults, by_alias=True)
-        if exclude_defaults is False:
-            # Remove 'id' fields with None values, as 'id' cannot be None
-            epd_data = remove_none_id_fields(epd_data)
+        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",

{openepd-5.3.0 → openepd-6.0.1}/src/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):
@@ -77,6 +78,12 @@ class Measurement(BaseOpenEpdSchema):
     )
 
 
+class IngredientEvidenceTypeEnum(StrEnum):
+    """Supported types of evidence for indirect ingredient."""
+
+    PRODUCT_EPD = "Product EPD"
+
+
 class Ingredient(BaseOpenEpdSchema):
     """
     An ingredient of a product.
@@ -84,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(
@@ -95,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."""

{openepd-5.3.0 → openepd-6.0.1}/src/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-6.0.1/src/openepd/model/specs/__init__.py

@@ -0,0 +1,52 @@
+#
+#  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.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.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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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-5.3.0 → openepd-6.0.1}/src/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="")

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/finishes.py

@@ -51,7 +51,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeAmount, RangeFloat, RangeInt, RangeRatioFloat
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AccessFlooringCoreMaterial,
     AccessFlooringFinishMaterial,
     AccessFlooringSeismicRating,
@@ -78,7 +78,14 @@ from openepd.model.specs.generated.enums import (
     WoodFlooringFabrication,
     WoodFlooringTimberSpecies,
 )
-from openepd.model.validation.quantity import AmountRangeGWP, AmountRangeLengthMm, AmountRangePressureMpa
+from openepd.model.validation.quantity import (
+    AmountRangeForce,
+    AmountRangeGWP,
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeRFactor,
+    AmountRangeYarnWeight,
+)
 
 
 class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -106,8 +113,8 @@ class AccessFlooringRangeV1(BaseOpenEpdHierarchicalSpec):
     panel_thickness: AmountRangeLengthMm | None = pyd.Field(default=None, description="")
     concentrated_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
     uniform_load: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    rolling_load_10_pass: str | None = pyd.Field(default=None, description="")
-    rolling_load_10000_pass: str | None = pyd.Field(default=None, description="")
+    rolling_load_10_pass: AmountRangeForce | None = pyd.Field(default=None, description="")
+    rolling_load_10000_pass: AmountRangeForce | None = pyd.Field(default=None, description="")
 
 
 class CarpetRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -124,7 +131,7 @@ class CarpetRangeV1(BaseOpenEpdHierarchicalSpec):
     intended_application: list[CarpetIntendedApplication] | None = pyd.Field(default=None, description="")
     manufacture_type: list[CarpetManufactureType] | None = pyd.Field(default=None, description="")
     form_factor: list[CarpetFormFactor] | None = pyd.Field(default=None, description="")
-    yarn_weight: str | None = pyd.Field(default=None, description="")
+    yarn_weight: AmountRangeYarnWeight | None = pyd.Field(default=None, description="")
     yarn_type: list[CarpetYarnType] | None = pyd.Field(default=None, description="")
     fire_radiant_panel_rating_astme648: str | None = pyd.Field(default=None, description="")
     fire_smoke_density_rating_astme648: str | None = pyd.Field(default=None, description="")
@@ -457,7 +464,7 @@ class GypsumRangeV1(BaseOpenEpdHierarchicalSpec):
     fire_rating: list[GypsumFireRating] | None = pyd.Field(default=None, description="")
     thickness: list[GypsumThickness] | None = pyd.Field(default=None, description="")
     facing: list[GypsumFacing] | None = pyd.Field(default=None, description="")
-    r_factor: str | None = pyd.Field(default=None, description="")
+    r_factor: AmountRangeRFactor | None = pyd.Field(default=None, description="")
     flame_spread_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     smoke_production_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     surface_abrasion_d4977: RangeInt | None = pyd.Field(default=None, description="")

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/fire_and_smoke_protection.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 (
+from openepd.model.specs.enums import (
     IntumescentFireproofingMaterialType,
     SprayFireproofingDensity,
     SprayFireproofingMaterialType,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/furnishings.py

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

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/manufacturing_inputs.py

@@ -33,7 +33,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.concrete import Cementitious
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AdmixtureEffects,
     CarpetYarnType,
     CementAstmType,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/masonry.py

@@ -25,7 +25,7 @@ __all__ = (
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.validation.quantity import AmountRangePressureMpa
+from openepd.model.validation.quantity import AmountRangePressureMpa, AmountRangeThermalConductivity
 
 
 class GMURangeV1(BaseOpenEpdHierarchicalSpec):
@@ -48,7 +48,7 @@ class AutoclavedAeratedConcreteRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
     strength_28d: AmountRangePressureMpa | None = pyd.Field(default=None, description="")
-    thermal_conductivity: str | None = pyd.Field(default=None, description="")
+    thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(default=None, description="")
     white: bool | None = pyd.Field(default=None, description="")
 
 

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/mechanical.py

@@ -37,7 +37,7 @@ __all__ = (
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     AhuAirflowControl,
     AhuZoneControl,
     AirFiltersMediaType,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/mechanical_insulation.py

@@ -21,7 +21,7 @@ __all__ = ("MechanicalInsulationRangeV1",)
 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 InsulatingMaterial, InsulationIntendedApplication
+from openepd.model.specs.enums import InsulatingMaterial, InsulationIntendedApplication
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/network_infrastructure.py

@@ -30,7 +30,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeInt
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     CableTraysMaterial,
     CablingCategory,
     CablingFireRating,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/openings.py

@@ -50,7 +50,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeInt, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FlatGlassPanesThickness,
     FrameMaterial,
     HardwareFunction,
@@ -58,8 +58,13 @@ from openepd.model.specs.generated.enums import (
     Spacer,
     ThermalSeparation,
 )
-from openepd.model.specs.generated.openings import GlazingIntendedApplication, NAFSPerformanceClass
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa, AmountRangeSpeed
+from openepd.model.specs.singular.openings import GlazingIntendedApplication, NAFSPerformanceClass
+from openepd.model.validation.quantity import (
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeSpeed,
+    AmountRangeUFactor,
+)
 
 
 class PanelDoorsRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -328,7 +333,7 @@ class NAFSFenestrationRangeV1(BaseOpenEpdHierarchicalSpec):
     hurricane_resistant: bool | None = pyd.Field(
         default=None, description="The product has been designed to resist windborne debris."
     )
-    assembly_u_factor: str | None = pyd.Field(
+    assembly_u_factor: AmountRangeUFactor | None = pyd.Field(
         default=None, description="Weighted average conductance of heat across assembly (including frame)."
     )
     air_infiltration: AmountRangeSpeed | None = pyd.Field(
@@ -386,7 +391,9 @@ class InsulatingGlazingUnitsRangeV1(BaseOpenEpdHierarchicalSpec):
         default=None,
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
     )
-    cog_u_factor: str | None = pyd.Field(default=None, description="Conductance of heat at center of glass.")
+    cog_u_factor: AmountRangeUFactor | None = pyd.Field(
+        default=None, description="Conductance of heat at center of glass."
+    )
     spacer: list[Spacer] | None = pyd.Field(default=None, description="Spacer material for Integrated Glass Unit.")
 
 

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/plumbing.py

@@ -35,7 +35,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeAmount
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import FireProtectionPipingMaterial, PipingAnsiSchedule, PlumbingPipingMaterial
+from openepd.model.specs.enums import FireProtectionPipingMaterial, PipingAnsiSchedule, PlumbingPipingMaterial
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/precast_concrete.py

@@ -27,7 +27,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.precast_concrete import (
+from openepd.model.specs.singular.precast_concrete import (
     ArchitecturalPrecastElementType,
     CivilPrecastElementType,
     StructuralPrecastElementType,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/sheathing.py

@@ -25,8 +25,8 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeInt
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import GypsumFacing, GypsumFireRating, GypsumThickness
-from openepd.model.validation.quantity import AmountRangeLengthMm
+from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
+from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeRFactor
 
 
 class CementitiousSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -58,7 +58,7 @@ class GypsumSheathingBoardRangeV1(BaseOpenEpdHierarchicalSpec):
     fire_rating: list[GypsumFireRating] | None = pyd.Field(default=None, description="")
     thickness: list[GypsumThickness] | None = pyd.Field(default=None, description="")
     facing: list[GypsumFacing] | None = pyd.Field(default=None, description="")
-    r_factor: str | None = pyd.Field(default=None, description="")
+    r_factor: AmountRangeRFactor | None = pyd.Field(default=None, description="")
     flame_spread_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     smoke_production_astm_e84: RangeInt | None = pyd.Field(default=None, description="")
     surface_abrasion_d4977: RangeInt | None = pyd.Field(default=None, description="")

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/steel.py

@@ -41,10 +41,15 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import SteelComposition, SteelRebarGrade
-from openepd.model.specs.generated.steel import SteelMakingRoute
+from openepd.model.specs.enums import SteelComposition, SteelRebarGrade
+from openepd.model.specs.singular.steel import SteelMakingRoute
 from openepd.model.standard import Standard
-from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa
+from openepd.model.validation.quantity import (
+    AmountRangeLengthMm,
+    AmountRangePressureMpa,
+    AmountRangeThermalConductivity,
+    AmountRangeThermalExpansion,
+)
 
 
 class ColdFormedFramingRangeV1(BaseOpenEpdHierarchicalSpec):
@@ -224,10 +229,10 @@ class StructuralSteelRangeV1(BaseOpenEpdHierarchicalSpec):
     modulus_of_elasticity: AmountRangePressureMpa | None = pyd.Field(
         default=None, description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus "
     )
-    thermal_expansion: str | None = pyd.Field(
+    thermal_expansion: AmountRangeThermalExpansion | None = pyd.Field(
         default=None, description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion"
     )
-    thermal_conductivity: str | None = pyd.Field(
+    thermal_conductivity: AmountRangeThermalConductivity | None = pyd.Field(
         default=None,
         description="Thermal Conductivity, https://en.wikipedia.org/wiki/Thermal_conductivity_and_resistivity",
     )

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/thermal_moisture_protection.py

@@ -44,7 +44,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, RangeRatioFloat
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FoamType,
     InsulatingMaterial,
     InsulationIntendedApplication,

{openepd-5.3.0 → openepd-6.0.1}/src/openepd/model/specs/range/utility_piping.py

@@ -25,7 +25,7 @@ __all__ = (
 from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeAmount
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
+from openepd.model.specs.enums import BuriedPipingType, PipingAnsiSchedule, UtilityPipingMaterial
 from openepd.model.validation.quantity import AmountRangeLengthMm