openepd 5.1.0__py3-none-any.whl → 6.1.0__py3-none-any.whl

openepd/model/specs/{generated → singular}/manufacturing_inputs.py

@@ -16,7 +16,7 @@
 from openepd.compat.pydantic import pyd
 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/model/specs/{generated → singular}/masonry.py

@@ -17,6 +17,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.quantity import (
     PressureMPaStr,
+    ThermalConductivityStr,
     validate_quantity_ge_factory,
     validate_quantity_unit_factory,
 )
@@ -35,7 +36,9 @@ class AutoclavedAeratedConcreteV1(BaseOpenEpdHierarchicalSpec):
 
     # Own fields:
     strength_28d: PressureMPaStr | None = pyd.Field(default=None, description="", example="1 MPa")
-    thermal_conductivity: str | None = pyd.Field(default=None, description="", example="1 W / (m * K)")
+    thermal_conductivity: ThermalConductivityStr | None = pyd.Field(
+        default=None, description="", example="1 W / (m * K)"
+    )
     white: bool | None = pyd.Field(default=None, description="", example=True)
 
     _aac_thermal_conductivity_is_quantity_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(

openepd/model/specs/{generated → singular}/mechanical.py

@@ -15,7 +15,7 @@
 #
 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/model/specs/{generated → singular}/mechanical_insulation.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 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 LengthMmStr
 
 

openepd/model/specs/{generated → singular}/mixins/conduit_mixin.py

@@ -17,7 +17,7 @@ __all__ = ["ConduitMixin"]
 
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdSpec
-from openepd.model.specs.generated.enums import ConduitMaterial
+from openepd.model.specs.enums import ConduitMaterial
 from openepd.model.validation.quantity import LengthMmStr
 
 

openepd/model/specs/{generated → singular}/network_infrastructure.py

@@ -15,7 +15,7 @@
 #
 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 (
     CableTraysMaterial,
     CablingCategory,
     CablingFireRating,
@@ -27,7 +27,7 @@ from openepd.model.specs.generated.enums import (
     RacewaysMaterial,
     RackType,
 )
-from openepd.model.specs.generated.mixins.conduit_mixin import ConduitMixin
+from openepd.model.specs.singular.mixins.conduit_mixin import ConduitMixin
 from openepd.model.validation.quantity import (
     ElectricalCurrentStr,
     LengthMmStr,

openepd/model/specs/{generated → singular}/openings.py

@@ -17,7 +17,7 @@
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.enums import (
     FlatGlassPanesThickness,
     FrameMaterial,
     HardwareFunction,
@@ -26,7 +26,13 @@ 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_quantity_unit_factory
+from openepd.model.validation.quantity import (
+    LengthMmStr,
+    PressureMPaStr,
+    SpeedStr,
+    UFactorStr,
+    validate_quantity_unit_factory,
+)
 
 
 class GlazingIntendedApplication(BaseOpenEpdSchema):
@@ -346,7 +352,7 @@ class NAFSFenestrationV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin):
         default=None, description="The product has been designed to resist windborne debris.", example=True
     )
 
-    assembly_u_factor: str | None = pyd.Field(
+    assembly_u_factor: UFactorStr | None = pyd.Field(
         default=None,
         description="Weighted average conductance of heat across assembly (including frame).",
         example="1 USI",
@@ -417,7 +423,7 @@ class InsulatingGlazingUnitsV1(BaseOpenEpdHierarchicalSpec, GlazingOptionsMixin)
         description="Number of panes, each separated by a cavity. A 3 pane unit has 2 cavities. example: 3",
         example=3,
     )
-    cog_u_factor: str | None = pyd.Field(
+    cog_u_factor: UFactorStr | None = pyd.Field(
         default=None, description="Conductance of heat at center of glass.", example="1 USI"
     )
     spacer: Spacer | None = pyd.Field(

openepd/model/specs/{generated → singular}/plumbing.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 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 LengthMmStr, MassPerLengthStr
 
 

openepd/model/specs/{generated → singular}/sheathing.py

@@ -15,8 +15,8 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import GypsumFacing, GypsumFireRating, GypsumThickness
-from openepd.model.validation.quantity import LengthMmStr, validate_quantity_unit_factory
+from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
+from openepd.model.validation.quantity import LengthMmStr, RFactorStr, validate_quantity_unit_factory
 
 
 class CementitiousSheathingBoardV1(BaseOpenEpdHierarchicalSpec):
@@ -51,7 +51,7 @@ class GypsumSheathingBoardV1(BaseOpenEpdHierarchicalSpec):
     thickness: GypsumThickness | None = pyd.Field(default=None, description="", example="9 mm")
     facing: GypsumFacing | None = pyd.Field(default=None, description="", example="Paper")
 
-    r_factor: str | None = pyd.Field(default=None, description="", example="1 RSI")
+    r_factor: RFactorStr | None = pyd.Field(default=None, description="", example="1 RSI")
 
     flame_spread_astm_e84: int | None = pyd.Field(default=None, description="", example=3)
     smoke_production_astm_e84: int | None = pyd.Field(default=None, description="", example=3)

openepd/model/specs/{generated → singular}/steel.py

@@ -18,10 +18,16 @@ from typing import Annotated
 from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, BaseOpenEpdSpec, CodegenSpec
-from openepd.model.specs.generated.enums import SteelComposition, SteelRebarGrade
+from openepd.model.specs.enums import SteelComposition, SteelRebarGrade
 from openepd.model.standard import Standard
 from openepd.model.validation.numbers import RatioFloat
-from openepd.model.validation.quantity import LengthMmStr, PressureMPaStr, validate_quantity_unit_factory
+from openepd.model.validation.quantity import (
+    LengthMmStr,
+    PressureMPaStr,
+    ThermalConductivityStr,
+    ThermalExpansionStr,
+    validate_quantity_unit_factory,
+)
 
 
 class SteelMakingRoute(BaseOpenEpdSchema):
@@ -175,15 +181,15 @@ class StructuralSteelV1(BaseOpenEpdHierarchicalSpec):
         description="Modulus of Elasticity, https://en.wikipedia.org/wiki/Elastic_modulus ",
         example="193 GPa",
     )
-    thermal_expansion: str | None = pyd.Field(
+    thermal_expansion: ThermalExpansionStr | None = pyd.Field(
         default=None,
         description="Thermal Expansion, https://en.wikipedia.org/wiki/Thermal_expansion",
         example="1.11E-5 / K",
     )
-    thermal_conductivity: str | None = pyd.Field(
+    thermal_conductivity: ThermalConductivityStr | None = pyd.Field(
         default=None,
         description="Thermal Conductivity, https://en.wikipedia.org/wiki/Thermal_conductivity_and_resistivity",
-        example="1.45E-5 W / (m * K)",
+        example="1.45E-5 W / m / K)",
     )
 
     _steel_thermal_expansion_is_quantity_validator = pyd.validator("thermal_expansion", allow_reuse=True)(

openepd/model/specs/{generated → singular}/thermal_moisture_protection.py

@@ -15,7 +15,7 @@
 #
 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 (
     FoamType,
     InsulatingMaterial,
     InsulationIntendedApplication,

openepd/model/specs/{generated → singular}/utility_piping.py

@@ -15,7 +15,7 @@
 #
 from openepd.compat.pydantic import pyd
 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 LengthMmStr, MassPerLengthStr
 
 

openepd/model/specs/{generated → singular}/wood.py

@@ -13,10 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+from typing import Annotated
+
 from openepd.compat.pydantic import pyd
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.common import HasForestPracticesCertifiers
-from openepd.model.specs.generated.enums import (
+from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec, CodegenSpec
+from openepd.model.specs.enums import (
     AllFabrication,
     AllTimberSpecies,
     CompositeLumberFabrication,
@@ -25,6 +26,7 @@ from openepd.model.specs.generated.enums import (
     SawnTimberSpecies,
     SheathingPanelsFabrication,
 )
+from openepd.model.specs.singular.common import HasForestPracticesCertifiers
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr
 
@@ -156,15 +158,19 @@ class WoodV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):
     weather_exposed: bool | None = pyd.Field(default=None, description="Weather exposed", example=True)
     fire_retardant: bool | None = pyd.Field(default=None, description="Fire retardant", example=True)
     decay_resistant: bool | None = pyd.Field(default=None, description="Decay resistant", example=True)
-    fsc_certified: RatioFloat | None = pyd.Field(
+    fsc_certified: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
         default=None, description="Forest Stewardship Council certified proportion", example=0.3, ge=0, le=1
     )
-    fsc_certified_z: float | None = pyd.Field(default=None, description="", example=0.7)
+    fsc_certified_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
+        default=None, description="", example=0.7
+    )
 
-    recycled_content: RatioFloat | None = pyd.Field(
+    recycled_content: Annotated[RatioFloat | None, CodegenSpec(override_type=RatioFloat)] = pyd.Field(
         default=None, description="Recycled content", example=0.3, ge=0, le=1
     )
-    recycled_content_z: float | None = pyd.Field(default=None, description="", example=0.7)
+    recycled_content_z: Annotated[float | None, CodegenSpec(override_type=float)] = pyd.Field(
+        default=None, description="", example=0.7
+    )
 
     # Nested specs:
     CompositeLumber: CompositeLumberV1 | None = None

openepd/model/specs/{generated → singular}/wood_joists.py

@@ -15,8 +15,8 @@
 #
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.common import HasForestPracticesCertifiers
-from openepd.model.specs.generated.enums import AllFabrication, AllTimberSpecies
+from openepd.model.specs.enums import AllFabrication, AllTimberSpecies
+from openepd.model.specs.singular.common import HasForestPracticesCertifiers
 
 
 class WoodJoistsV1(BaseOpenEpdHierarchicalSpec, HasForestPracticesCertifiers):

openepd/model/validation/enum.py

@@ -0,0 +1,42 @@
+#
+#  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 typing import Any, Callable
+
+from openepd.model.common import EnumGroupingAware
+
+
+def exclusive_groups_validator_factory(enum_type: type[EnumGroupingAware]) -> Callable[[type, Any], Any]:
+    """
+    Create an exclusive groups validator.
+
+    If we have a certain enum TheEnum, and a field of list[TheEnum], where list can contain only one value of each of
+    the groups, this validator should be used. For example, ACI exposure classes for concrete specify various
+    parameters such as water resistance, chemical resistance, etc., and the list of classes can have 0 or 1 from each
+    group.
+
+    :param enum_type:Enum type which supports groupings.
+    :return:value, or raises ValueError if not allowed combination is given.
+    """
+
+    def enum_exclusive_grouping_validator(cls, value: list | None) -> list | None:
+        for grouping in enum_type.get_groupings():
+            matching_from_group = [v for v in (value or []) if v in grouping]
+            if len(matching_from_group) > 1:
+                raise ValueError(f"Values {', '.join(matching_from_group)} are not allowed together.")
+
+        return value
+
+    return enum_exclusive_grouping_validator

openepd/model/validation/quantity.py

@@ -307,6 +307,48 @@ class AreaPerVolumeStr(QuantityStr):
     unit = "m2 / l"
 
 
+class ThermalConductivityStr(QuantityStr):
+    """Thermal conductivity quantity type."""
+
+    unit = "1 W / K / m"
+
+
+class ThermalExpansionStr(QuantityStr):
+    """Thermal conductivity quantity type."""
+
+    unit = "1 / K"
+
+
+class ForceNStr(QuantityStr):
+    """Force (N) type."""
+
+    unit = "1 N"
+
+
+class YarnWeightStr(QuantityStr):
+    """Yarn weight quantity type."""
+
+    unit = "1 g / m2"
+
+
+class UtilizationStr(QuantityStr):
+    """Utilization quantity type."""
+
+    unit = "1 h / yr"
+
+
+class UFactorStr(QuantityStr):
+    """Utilization quantity type."""
+
+    unit = "1 USI"
+
+
+class RFactorStr(QuantityStr):
+    """R-Factor type."""
+
+    unit = "1 RSI"
+
+
 class WithDimensionalityMixin(BaseOpenEpdSchema):
     """Class for dimensionality-validated amounts."""
 
@@ -696,6 +738,136 @@ class AmountRangeAreaPerVolume(AmountRangeWithDimensionality, WithFlowRateMixin)
     pass
 
 
+class WithThermalConductivity(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = ThermalConductivityStr.unit
+
+
+class AmountThermalConductivityMixin(Amount, WithThermalConductivity):
+    """Area per volume."""
+
+    pass
+
+
+class AmountRangeThermalConductivity(AmountRangeWithDimensionality, WithThermalConductivity):
+    """Area per volume range."""
+
+    pass
+
+
+class WithForce(WithDimensionalityMixin):
+    """
+    Unit validation mixin.
+
+    May the Force be with you.
+    """
+
+    dimensionality_unit = ForceNStr.unit
+
+
+class AmountForce(Amount, WithForce):
+    """Area per volume."""
+
+    pass
+
+
+class AmountRangeForce(AmountRangeWithDimensionality, WithForce):
+    """Area per volume range."""
+
+    pass
+
+
+class WithYarnWeight(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = YarnWeightStr.unit
+
+
+class AmountYarnWeight(Amount, WithYarnWeight):
+    """Yarn weight."""
+
+    pass
+
+
+class AmountRangeYarnWeight(AmountRangeWithDimensionality, WithYarnWeight):
+    """Yarn weight range."""
+
+    pass
+
+
+class WithThermalExpansion(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = ThermalExpansionStr.unit
+
+
+class AmountThermalExpansion(Amount, WithThermalExpansion):
+    """Yarn weight."""
+
+    pass
+
+
+class AmountRangeThermalExpansion(AmountRangeWithDimensionality, WithThermalExpansion):
+    """Yarn weight range."""
+
+    pass
+
+
+class WithUtilization(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = UtilizationStr.unit
+
+
+class AmountUtilization(Amount, WithUtilization):
+    """Utilization."""
+
+    pass
+
+
+class AmountRangeUtilization(AmountRangeWithDimensionality, WithUtilization):
+    """Utilization range."""
+
+    pass
+
+
+class WithUFactor(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = UFactorStr.unit
+
+
+class AmountUFactor(Amount, WithUFactor):
+    """U-Factor."""
+
+    pass
+
+
+class AmountRangeUFactor(AmountRangeWithDimensionality, WithUFactor):
+    """U-Factor range."""
+
+    pass
+
+
+class WithRFactor(WithDimensionalityMixin):
+    """Unit validation mixin."""
+
+    dimensionality_unit = RFactorStr.unit
+
+
+class AmountRFactor(Amount, WithRFactor):
+    """R-Factor."""
+
+    pass
+
+
+class AmountRangeRFactor(AmountRangeWithDimensionality, WithRFactor):
+    """R-Factor range."""
+
+    pass
+
+
 # known range amounts
 SUPPORTED_RANGE_TYPES: tuple[type[AmountRangeWithDimensionality], ...] = (
     AmountRangeMass,
@@ -718,6 +890,13 @@ SUPPORTED_RANGE_TYPES: tuple[type[AmountRangeWithDimensionality], ...] = (
     AmountRangeFlowRate,
     AmountRangeMassPerLength,
     AmountRangeAreaPerVolume,
+    AmountRangeThermalConductivity,
+    AmountRangeForce,
+    AmountRangeYarnWeight,
+    AmountRangeThermalExpansion,
+    AmountRangeUtilization,
+    AmountRangeUFactor,
+    AmountRangeRFactor,
 )
 
 # known range amount mapping by unit

{openepd-5.1.0.dist-info → openepd-6.1.0.dist-info}/METADATA

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