openepd 6.30.0__tar.gz → 6.31.1__tar.gz

{openepd-6.30.0 → openepd-6.31.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openepd
-Version: 6.30.0
+Version: 6.31.1
 Summary: Python library to work with OpenEPD format
 License: Apache-2.0
 Author: C-Change Labs

{openepd-6.30.0 → openepd-6.31.1}/pyproject.toml

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

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/__version__.py

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

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/model/specs/__init__.py

@@ -60,7 +60,7 @@ 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 import ElectricalV1, OtherElectricalEquipmentV1
 from openepd.model.specs.singular.electrical_transmission_and_distribution_equipment import (
     ElectricalTransmissionAndDistributionEquipmentV1,
 )
@@ -76,7 +76,6 @@ 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

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/model/specs/range/__init__.py

@@ -18,6 +18,7 @@ __all__ = [
 ]
 
 
+from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 
 from .accessories import AccessoriesRangeV1
@@ -30,7 +31,7 @@ from .cladding import CladdingRangeV1
 from .cmu import CMURangeV1
 from .concrete import ConcreteRangeV1
 from .conveying_equipment import ConveyingEquipmentRangeV1
-from .electrical import ElectricalRangeV1
+from .electrical import ElectricalRangeV1, OtherElectricalEquipmentRangeV1
 from .electrical_transmission_and_distribution_equipment import ElectricalTransmissionAndDistributionEquipmentRangeV1
 from .electricity import ElectricityRangeV1
 from .exterior_improvements import ExteriorImprovementsRangeV1
@@ -53,7 +54,6 @@ from .non_construction import (
     VehiclesRangeV1,
 )
 from .openings import OpeningsRangeV1
-from .other_electrical_equipment import OtherElectricalEquipmentRangeV1
 from .other_materials import FoodBeverageRangeV1, OtherMaterialsRangeV1, TextileProductsRangeV1
 from .plumbing import PlumbingRangeV1
 from .precast_concrete import PrecastConcreteRangeV1
@@ -106,7 +106,6 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     Electricity: ElectricityRangeV1 | None = None
     Grouting: GroutingRangeV1 | None = None
     MechanicalInsulation: MechanicalInsulationRangeV1 | None = None
-    OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = None
     WoodJoists: WoodJoistsRangeV1 | None = None
     ExteriorImprovements: ExteriorImprovementsRangeV1 | None = None
     TextileProducts: TextileProductsRangeV1 | None = None
@@ -117,3 +116,11 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     Services: ServicesRangeV1 | None = None
     ConsumerGoods: ConsumerGoodsRangeV1 | None = None
     FoodBeverage: FoodBeverageRangeV1 | None = None
+
+    OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = pyd.Field(
+        default=None,
+        deprecated="SpecsRange.OtherElectricalEquipment is deprecated. Use ElectricalRangeV1.OtherElectricalEquipment instead.",
+    )
+    """
+    SpecsRange.OtherElectricalEquipment is deprecated. Use ElectricalRangeV1.OtherElectricalEquipment instead.
+    """

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/model/specs/range/electrical.py

@@ -33,6 +33,7 @@ __all__ = (
     "LowVoltBusesRangeV1",
     "LowVoltageElectricalDistributionRangeV1",
     "MedVoltBusesRangeV1",
+    "OtherElectricalEquipmentRangeV1",
     "OtherElectricalPowerStorageRangeV1",
     "OtherGenerationRangeV1",
     "OutdoorLightingRangeV1",
@@ -406,6 +407,16 @@ class ElectricalConduitRangeV1(BaseOpenEpdHierarchicalSpec):
     material: list[ConduitMaterial] | None = None
 
 
+class OtherElectricalEquipmentRangeV1(BaseOpenEpdHierarchicalSpec):
+    """
+    Other Electrical Equipment.
+
+    Range version.
+    """
+
+    _EXT_VERSION = "1.0"
+
+
 class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Electric power and equipment.
@@ -413,7 +424,7 @@ class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.1"
+    _EXT_VERSION = "1.2"
 
     ElectricalPowerStorage: ElectricalPowerStorageRangeV1 | None = None
     LowVoltageElectricalDistribution: LowVoltageElectricalDistributionRangeV1 | None = None
@@ -421,3 +432,4 @@ class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     ElectricPower: ElectricPowerRangeV1 | None = None
     Lighting: LightingRangeV1 | None = None
     ElectricalConduit: ElectricalConduitRangeV1 | None = None
+    OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = None

openepd-6.31.1/src/openepd/model/specs/range/other_electrical_equipment.py

@@ -0,0 +1,18 @@
+#
+#  Copyright 2025 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.
+#
+
+# Deprecated import: This import is kept for backward compatibility and should be removed in the future.
+from .electrical import OtherElectricalEquipmentRangeV1  # noqa: F401

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/model/specs/singular/__init__.py

@@ -37,7 +37,7 @@ from openepd.model.specs.singular.conveying_equipment import ConveyingEquipmentV
 from openepd.model.specs.singular.deprecated import BaseCompatibilitySpec, get_safely, set_safely
 from openepd.model.specs.singular.deprecated.concrete import ConcreteOldSpec
 from openepd.model.specs.singular.deprecated.steel import SteelOldSpec
-from openepd.model.specs.singular.electrical import ElectricalV1
+from openepd.model.specs.singular.electrical import ElectricalV1, OtherElectricalEquipmentV1
 from openepd.model.specs.singular.electrical_transmission_and_distribution_equipment import (
     ElectricalTransmissionAndDistributionEquipmentV1,
 )
@@ -62,7 +62,6 @@ from openepd.model.specs.singular.non_construction import (
     VehiclesV1,
 )
 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 FoodBeverageV1, OtherMaterialsV1, TextileProductsV1
 from openepd.model.specs.singular.plumbing import PlumbingV1
 from openepd.model.specs.singular.precast_concrete import PrecastConcreteV1
@@ -116,7 +115,6 @@ class Specs(BaseOpenEpdHierarchicalSpec):
     Electricity: ElectricityV1 | None = None
     Grouting: GroutingV1 | None = None
     MechanicalInsulation: MechanicalInsulationV1 | None = None
-    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = None
     WoodJoists: WoodJoistsV1 | None = None
     ExteriorImprovements: ExteriorImprovementsV1 | None = None
     TextileProducts: TextileProductsV1 | None = None
@@ -128,6 +126,14 @@ class Specs(BaseOpenEpdHierarchicalSpec):
     ConsumerGoods: ConsumerGoodsV1 | None = None
     FoodBeverage: FoodBeverageV1 | None = None
 
+    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = pyd.Field(
+        default=None,
+        deprecated="Specs.OtherElectricalEquipment is deprecated. Use ElectricalV1.OtherElectricalEquipment instead.",
+    )
+    """
+    Specs.OtherElectricalEquipment is deprecated. Use ElectricalV1.OtherElectricalEquipment instead.
+    """
+
     # historical backward-compatible specs
     concrete: ConcreteOldSpec | None = None
     steel: SteelOldSpec | None = None

{openepd-6.30.0 → openepd-6.31.1}/src/openepd/model/specs/singular/electrical.py

@@ -13,6 +13,39 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+__all__ = (
+    "BatteriesV1",
+    "CableTraysV1",
+    "ElectricPowerV1",
+    "ElectricalBusesV1",
+    "ElectricalConduitV1",
+    "ElectricalGenerationEquipmentV1",
+    "ElectricalPowerStorageV1",
+    "ElectricalV1",
+    "ElectricityFromPowerGridV1",
+    "ElectricityFromSpecificGeneratorV1",
+    "FloorEquipmentBoxesV1",
+    "FueledElectricalGeneratorsV1",
+    "LightbulbsV1",
+    "LightingControlsV1",
+    "LightingFixturesV1",
+    "LightingV1",
+    "LowVoltBusesV1",
+    "LowVoltageElectricalDistributionV1",
+    "MedVoltBusesV1",
+    "OtherElectricalEquipmentV1",
+    "OtherElectricalPowerStorageV1",
+    "OtherGenerationV1",
+    "OutdoorLightingV1",
+    "PhotovoltaicsV1",
+    "PowerDistributionUnitsV1",
+    "PowerPurchaseAgreementsV1",
+    "RacewaysV1",
+    "SpecialtyLightingV1",
+    "TaskLightingV1",
+    "WindTurbinesV1",
+)
+
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CableTraysMaterial, EnergySource, RacewaysMaterial
@@ -298,10 +331,16 @@ class ElectricalConduitV1(BaseOpenEpdHierarchicalSpec, ConduitMixin):
     _EXT_VERSION = "1.1"
 
 
+class OtherElectricalEquipmentV1(BaseOpenEpdHierarchicalSpec):
+    """Other Electrical Equipment."""
+
+    _EXT_VERSION = "1.0"
+
+
 class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     """Electric power and equipment."""
 
-    _EXT_VERSION = "1.1"
+    _EXT_VERSION = "1.2"
 
     # Nested specs:
     ElectricalPowerStorage: ElectricalPowerStorageV1 | None = None
@@ -310,3 +349,4 @@ class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     ElectricPower: ElectricPowerV1 | None = None
     Lighting: LightingV1 | None = None
     ElectricalConduit: ElectricalConduitV1 | None = None
+    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = None

openepd-6.31.1/src/openepd/model/specs/singular/other_electrical_equipment.py

@@ -0,0 +1,18 @@
+#
+#  Copyright 2025 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.
+#
+
+# Deprecated import: This import is kept for backward compatibility and should be removed in the future.
+from .electrical import OtherElectricalEquipmentV1  # noqa: F401

openepd-6.30.0/src/openepd/model/specs/range/other_electrical_equipment.py

@@ -1,31 +0,0 @@
-#
-#  Copyright 2025 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__ = ("OtherElectricalEquipmentRangeV1",)
-
-# NB! This is a generated code. Do not edit it manually. Please see src/openepd/model/specs/README.md
-
-
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-
-
-class OtherElectricalEquipmentRangeV1(BaseOpenEpdHierarchicalSpec):
-    """
-    Other Electrical Equipment.
-
-    Range version.
-    """
-
-    _EXT_VERSION = "1.0"

openepd-6.30.0/src/openepd/model/specs/singular/other_electrical_equipment.py

@@ -1,22 +0,0 @@
-#
-#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
-
-
-class OtherElectricalEquipmentV1(BaseOpenEpdHierarchicalSpec):
-    """Other Electrical Equipment."""
-
-    _EXT_VERSION = "1.0"