openepd 7.12.0__py3-none-any.whl → 7.13.0__py3-none-any.whl

openepd/__version__.py

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

openepd/model/specs/__init__.py

@@ -61,7 +61,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,
 )
@@ -77,7 +77,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/model/specs/range/__init__.py

@@ -18,6 +18,8 @@ __all__ = [
 ]
 
 
+import pydantic
+
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 
 from .accessories import AccessoriesRangeV1
@@ -30,7 +32,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 +55,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 +107,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 +117,16 @@ class SpecsRange(BaseOpenEpdHierarchicalSpec):
     Services: ServicesRangeV1 | None = None
     ConsumerGoods: ConsumerGoodsRangeV1 | None = None
     FoodBeverage: FoodBeverageRangeV1 | None = None
+
+    OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = pydantic.Field(
+        default=None,
+        json_schema_extra={
+            "deprecated": True,
+        },
+        description=(
+            "SpecsRange.OtherElectricalEquipment is deprecated. Use ElectricalRangeV1.OtherElectricalEquipment instead."
+        ),
+    )
+    """
+    SpecsRange.OtherElectricalEquipment is deprecated. Use ElectricalRangeV1.OtherElectricalEquipment instead.
+    """

openepd/model/specs/range/electrical.py

@@ -408,6 +408,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.
@@ -415,7 +425,7 @@ class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.1"
+    _EXT_VERSION = "1.2"
 
     ElectricalPowerStorage: ElectricalPowerStorageRangeV1 | None = None
     LowVoltageElectricalDistribution: LowVoltageElectricalDistributionRangeV1 | None = None
@@ -423,3 +433,4 @@ class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     ElectricPower: ElectricPowerRangeV1 | None = None
     Lighting: LightingRangeV1 | None = None
     ElectricalConduit: ElectricalConduitRangeV1 | None = None
+    OtherElectricalEquipment: OtherElectricalEquipmentRangeV1 | None = None

openepd/model/specs/singular/__init__.py

@@ -40,7 +40,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,
 )
@@ -65,7 +65,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
@@ -122,7 +121,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
@@ -134,6 +132,17 @@ class Specs(BaseOpenEpdHierarchicalSpec):
     ConsumerGoods: ConsumerGoodsV1 | None = None
     FoodBeverage: FoodBeverageV1 | None = None
 
+    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = pydantic.Field(
+        default=None,
+        json_schema_extra={
+            "deprecated": True,
+        },
+        description="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/model/specs/singular/electrical.py

@@ -326,10 +326,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
@@ -338,3 +344,4 @@ class ElectricalV1(BaseOpenEpdHierarchicalSpec):
     ElectricPower: ElectricPowerV1 | None = None
     Lighting: LightingV1 | None = None
     ElectricalConduit: ElectricalConduitV1 | None = None
+    OtherElectricalEquipment: OtherElectricalEquipmentV1 | None = None

{openepd-7.12.0.dist-info → openepd-7.13.0.dist-info}/METADATA

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

{openepd-7.12.0.dist-info → openepd-7.13.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
-openepd/__version__.py,sha256=p1iAdxzRKk4JP5O5NZZ9ferstcAaAoEObUavhFIQqXU,639
+openepd/__version__.py,sha256=nxitozeMrGujtN03G85IeTSzwzKLY1-NdBqX4axAPKA,639
 openepd/api/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=mjTT8eGtfj6Fgp-wcs0cCWA7DJo1KL_iQ75rgKkaY3c,8037
@@ -54,12 +54,12 @@ openepd/model/lcia.py,sha256=6o6GNwLaQaWyYAXCnHl2aAgDa12_v7DwpME5BfVMezk,32780
 openepd/model/org.py,sha256=ij_GEFEShRh-k4o29gSowiaJbCuyNqWu61YL3BNq0FM,9369
 openepd/model/pcr.py,sha256=cu3EakCAjBCkcb_AaLXB-xEjY0mlG-wJe74zGc5tdS0,5637
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
-openepd/model/specs/__init__.py,sha256=RMLxvwD-_N5qaU0U2o5LxMKmP_W0_yssl72uTTC2tJg,3904
+openepd/model/specs/__init__.py,sha256=-3uaImbGfOkRdpHQkhHe0eimAg0UBntR3WiT21Pmt1I,3837
 openepd/model/specs/asphalt.py,sha256=Vj9q6ZDwl6Mv8XX_PWVuqVwDIzQ7MEIamysF5cmYteQ,3536
 openepd/model/specs/base.py,sha256=0dwoChpyj-vnsMlaSEpklZnJkK9C05GbuTYi71AS_FY,2779
 openepd/model/specs/concrete.py,sha256=gjly5f7QEuaKnYZStMm0CisU0Us1PUa2HmxPyhhmuO0,5573
 openepd/model/specs/enums.py,sha256=o_9Li-T2CrL73ugiELj_JnI4NqrrgR0rhCswpVR7IS4,63828
-openepd/model/specs/range/__init__.py,sha256=MlECuiVIB3QBrcc-J_iQgqztD-Kp9mMFiacQoDzKliA,5202
+openepd/model/specs/range/__init__.py,sha256=BizCeVTZUxzCosJdH5AUDMlATOfDEkzdDz97DRkBsVg,5572
 openepd/model/specs/range/accessories.py,sha256=hZYz8mvAqrfLFiOIZ9qQZ59zmEiu0xE61Ko9cQ7NSKU,2498
 openepd/model/specs/range/aggregates.py,sha256=wnGI6AxtQaaYgCGvqYUuM94JVOBipCBRvFLTwpflsyA,2555
 openepd/model/specs/range/aluminium.py,sha256=6fvrm2cyToG_pf7B_vl6QPYjoyWFSctEA8CIi8E1ys4,2741
@@ -70,7 +70,7 @@ openepd/model/specs/range/cladding.py,sha256=7sk1wE3V_yt_nwvLFSnIZMjJ5d7OCbMh2MY
 openepd/model/specs/range/cmu.py,sha256=Xi_YL58VPBgfW0I6jqRwsIxnMoVztRfx1IFn3EP9MlM,1851
 openepd/model/specs/range/concrete.py,sha256=PnvgMzshcB5nvLYMkT41PzixpEtiYtAGOGLixvtEQ5Q,7685
 openepd/model/specs/range/conveying_equipment.py,sha256=BLuy_FhgERau3fSaGOuP7ZZpe_PH7s0ttVUzB06BjtU,3216
-openepd/model/specs/range/electrical.py,sha256=NDMcW_D1Twt0xnaUcc1_W-xiPycIlpL4694BPDNh_0I,11945
+openepd/model/specs/range/electrical.py,sha256=WSzVi5tkqtulmqZc8xKh0HjdgBFjONFeo1tEFWKyw0Q,12185
 openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,sha256=xDdyLj6oJRmdybq7W91MtgE80FDpaG6ii5hE921aRGQ,2525
 openepd/model/specs/range/electricity.py,sha256=yn_S25C_tZqseb8hiJ1yiHszu2mQ49FOFWWCqNpOBY0,997
 openepd/model/specs/range/exterior_improvements.py,sha256=MRKRXB648H4DkK-kpvrcbNek2mSJKHSoMak_OC9iWVA,1720
@@ -88,7 +88,6 @@ openepd/model/specs/range/mixins/access_flooring_mixin.py,sha256=pQH7lt7oD3e8g19
 openepd/model/specs/range/network_infrastructure.py,sha256=nq8g1s7_EKjZNODxnlfMB7ipZ90z5w7TVd6b5EUywkA,8738
 openepd/model/specs/range/non_construction.py,sha256=PDJn1QKQR9wHYr-KtWIxji-41IKFSeMZUS1fSjy4QGU,1664
 openepd/model/specs/range/openings.py,sha256=j7c49jlvfvnu03KVvYiNyyWEAjQYcxW6czxgD1z93Rw,15734
-openepd/model/specs/range/other_electrical_equipment.py,sha256=H4tZHcHyR2uUYHn-bQfLC6hR4tynVp_7EJbiI-YpK7Y,1001
 openepd/model/specs/range/other_materials.py,sha256=RaLM3TrQ_woHJpYUug6XapSZmWfzYbkFlULegWfBab4,5962
 openepd/model/specs/range/plumbing.py,sha256=pjdIOvQAat-8e0zqJM7gs30h131mqryU5uCGOdeTRaE,5382
 openepd/model/specs/range/precast_concrete.py,sha256=i766QYGjnl5_1Ip_6_-x1QpCXSybM0bjN4ESq2njIQ0,3820
@@ -98,7 +97,7 @@ openepd/model/specs/range/thermal_moisture_protection.py,sha256=cdr610ZdOlbd3LYz
 openepd/model/specs/range/utility_piping.py,sha256=doRcQRfBWvHX7FDDYk-bEU5rVCS_vjZ_5gKslI0xR7Y,2671
 openepd/model/specs/range/wood.py,sha256=WIZOSixS1hlmI66XpL9PhVRZ3ST423A_ihCz2CEbuCk,6914
 openepd/model/specs/range/wood_joists.py,sha256=PVGJZPdaI685rUI6TS3MZrAFkeMckFGpCYTNJLBr6IM,1786
-openepd/model/specs/singular/__init__.py,sha256=9qs3oyW5-z9Qq6BfCzaR9WzoNtT0DgOrGHVesswSyUY,12225
+openepd/model/specs/singular/__init__.py,sha256=jlivBY6OZShPAWCoh-0AUIPO45deG-9Yk1MKwv2Z44s,12506
 openepd/model/specs/singular/accessories.py,sha256=xcuSJrG84oTm_w76_wlv_sItfK36gSyDmUD2TnpZnVE,2013
 openepd/model/specs/singular/aggregates.py,sha256=n_AbZK6TJHJ6boyMz6AyikUkMiNlq8G_NOcqEy_A-Sg,2975
 openepd/model/specs/singular/aluminium.py,sha256=rOFEzIVvR2t0QGLN3Zk_Pi_m4v2dMU4PoDQN1hULMn4,2524
@@ -113,7 +112,7 @@ openepd/model/specs/singular/conveying_equipment.py,sha256=Hcy1zcXKsGIuh303xiRJw
 openepd/model/specs/singular/deprecated/__init__.py,sha256=NufJ5lJeuWQ_aV7tHIX_H_StU4fNdGkcEaCA64FOcsA,2619
 openepd/model/specs/singular/deprecated/concrete.py,sha256=xqHxwFUzy0XEa66e1N1Z3aKt6hhnHhbJ76XiRoe0wtQ,5604
 openepd/model/specs/singular/deprecated/steel.py,sha256=xqp6rqA49ARY7uvObvnNh-y9cN0WCy0Qz3sMuuIBXPY,3647
-openepd/model/specs/singular/electrical.py,sha256=lLp8MjAULlnfINi7AayexTGDorSEH_r9OONFcxVHcs4,11598
+openepd/model/specs/singular/electrical.py,sha256=URg3d-Gy8hrmlY-Mj9Vf09mEAtxHmdZxzgWdSa1ptcc,11798
 openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.py,sha256=oZYyHgnXn9RH3YzltUEDiiQKrin2mvMlTgC3OhxV7DY,1978
 openepd/model/specs/singular/electricity.py,sha256=f1cJ9eklNUf97khCIZiT5-z8V_TbOcvH2me_1UTQVrE,823
 openepd/model/specs/singular/exterior_improvements.py,sha256=f_xJJCVVAlHi5A7v1x9Xu_CIht4M-PstAtabWxDxLMA,1695
@@ -132,7 +131,6 @@ openepd/model/specs/singular/mixins/conduit_mixin.py,sha256=H5rbXIy3lpiU_Rub3_f7
 openepd/model/specs/singular/network_infrastructure.py,sha256=QGMIFzexHH94phkFw7iYl-fTZ_514dwYgvC-2sHjOZw,9316
 openepd/model/specs/singular/non_construction.py,sha256=VW_dP5I8AUkwa923d2r9X8S78k6OUA5rU0UAypUX8t8,1634
 openepd/model/specs/singular/openings.py,sha256=8XI9W-4h9oK1_hWNVOzNwvWxIZdAEze0A8ach5hThSU,19794
-openepd/model/specs/singular/other_electrical_equipment.py,sha256=FX7p4rMuUbTrz1yDwKkS-Z6odohoq-zCw6SU3Kw5ISs,814
 openepd/model/specs/singular/other_materials.py,sha256=5KbH-db7-FpHiinTRcrGLcIDDkn790a3Mem5ZPpwcsA,4908
 openepd/model/specs/singular/plumbing.py,sha256=dP6r7xy2yeP8ICEBN79CfJqyDiuwpTtDnURBfWmFWPs,4639
 openepd/model/specs/singular/precast_concrete.py,sha256=25vn5UxiQbhsNisqBF9_GYASMl3D1iuDWxfnV5HOV4k,7567
@@ -156,7 +154,7 @@ openepd/utils/mapping/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dv
 openepd/utils/mapping/common.py,sha256=hxfN-WW2WLwE_agQzf_mhvz6OHq5WWlr24uZ1S81k4Y,8426
 openepd/utils/mapping/geography.py,sha256=1_-dvLk11Hqn-K58yUI5pQ5X5gsnJPFlFT7JK2Rdoeg,2396
 openepd/utils/markdown.py,sha256=RQmudPhb4QU1I4-S-VV2WFbzzq2Po09kbpjjKbwkA9E,1830
-openepd-7.12.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-7.12.0.dist-info/METADATA,sha256=3VZcyUfh9My80cp8CWOJOG2dvkxAs9Cv2AT3D2xh9TU,9811
-openepd-7.12.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openepd-7.12.0.dist-info/RECORD,,
+openepd-7.13.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-7.13.0.dist-info/METADATA,sha256=L_MQy3vYZ83yVCZblQ7-I5dwbIeEzbu-mxsyiUlA1hQ,9811
+openepd-7.13.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openepd-7.13.0.dist-info/RECORD,,

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/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"