openepd 5.2.0__tar.gz → 6.0.0__tar.gz

{openepd-5.2.0 → openepd-6.0.0}/PKG-INFO

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

{openepd-5.2.0 → openepd-6.0.0}/pyproject.toml

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

{openepd-5.2.0 → openepd-6.0.0}/src/openepd/__version__.py

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

{openepd-5.2.0 → openepd-6.0.0}/src/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-5.2.0 → openepd-6.0.0}/src/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-6.0.0/src/openepd/api/utils.py

@@ -0,0 +1,68 @@
+#
+#  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.
+#
+__all__ = ("encode_path_param",)
+
+from urllib.parse import quote
+
+
+def encode_path_param(value: str) -> str:
+    """
+    Encode a path parameter value.
+
+    :param value: parameter value
+    :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-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.0/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/asphalt.py

@@ -21,7 +21,7 @@ __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.specs.enums import AsphaltGradation, AsphaltMixType
 from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangeTemperatureC
 
 

{openepd-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/cmu.py

@@ -21,7 +21,7 @@ __all__ = ("CMURangeV1",)
 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.specs.enums import CmuBlockType, CmuWeightClassification
 from openepd.model.validation.quantity import AmountRangeGWP, AmountRangePressureMpa
 
 

{openepd-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/electrical.py

@@ -51,7 +51,7 @@ __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,

{openepd-5.2.0 → openepd-6.0.0}/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,

{openepd-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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,7 +58,7 @@ from openepd.model.specs.generated.enums import (
     Spacer,
     ThermalSeparation,
 )
-from openepd.model.specs.generated.openings import GlazingIntendedApplication, NAFSPerformanceClass
+from openepd.model.specs.singular.openings import GlazingIntendedApplication, NAFSPerformanceClass
 from openepd.model.validation.quantity import AmountRangeLengthMm, AmountRangePressureMpa, AmountRangeSpeed
 
 

{openepd-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/sheathing.py

@@ -25,7 +25,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 GypsumFacing, GypsumFireRating, GypsumThickness
+from openepd.model.specs.enums import GypsumFacing, GypsumFireRating, GypsumThickness
 from openepd.model.validation.quantity import AmountRangeLengthMm
 
 

{openepd-5.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/steel.py

@@ -41,8 +41,8 @@ __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
 

{openepd-5.2.0 → openepd-6.0.0}/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.2.0 → openepd-6.0.0}/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
 
 

{openepd-5.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/wood.py

@@ -36,7 +36,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.common import RangeFloat, 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 (
     AllFabrication,
     AllTimberSpecies,
     CompositeLumberFabrication,

{openepd-5.2.0 → openepd-6.0.0}/src/openepd/model/specs/range/wood_joists.py

@@ -21,7 +21,7 @@ __all__ = ("WoodJoistsRangeV1",)
 from openepd.compat.pydantic import pyd
 from openepd.model.org import OrgRef
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-from openepd.model.specs.generated.enums import AllFabrication, AllTimberSpecies
+from openepd.model.specs.enums import AllFabrication, AllTimberSpecies
 
 
 class WoodJoistsRangeV1(BaseOpenEpdHierarchicalSpec):

{openepd-5.2.0/src/openepd/model/specs → openepd-6.0.0/src/openepd/model/specs/singular}/__init__.py

@@ -13,44 +13,43 @@
 #  See the License for the specific language governing permissions and
 #  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
+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
 
 
 class Specs(BaseOpenEpdSchema):

{openepd-5.2.0/src/openepd/model/specs/generated → openepd-6.0.0/src/openepd/model/specs/singular}/aggregates.py

@@ -16,7 +16,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 AggregateGradation, AggregateWeightClassification
+from openepd.model.specs.enums import AggregateGradation, AggregateWeightClassification
 from openepd.model.validation.numbers import RatioFloat
 from openepd.model.validation.quantity import LengthMmStr
 

{openepd-5.2.0/src/openepd/model/specs/generated → openepd-6.0.0/src/openepd/model/specs/singular}/aluminium.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 AluminiumAlloy
+from openepd.model.specs.enums import AluminiumAlloy
 
 
 class AluminiumBilletsV1(BaseOpenEpdHierarchicalSpec):