openepd 6.30.0__py3-none-any.whl → 6.31.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 = "6.30.0"
+VERSION = "6.31.0"

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/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/model/specs/range/electrical.py

@@ -406,6 +406,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 +423,7 @@ class ElectricalRangeV1(BaseOpenEpdHierarchicalSpec):
     Range version.
     """
 
-    _EXT_VERSION = "1.1"
+    _EXT_VERSION = "1.2"
 
     ElectricalPowerStorage: ElectricalPowerStorageRangeV1 | None = None
     LowVoltageElectricalDistribution: LowVoltageElectricalDistributionRangeV1 | None = None
@@ -421,3 +431,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

@@ -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/model/specs/singular/electrical.py

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

{openepd-6.30.0.dist-info → openepd-6.31.0.dist-info}/METADATA

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

{openepd-6.30.0.dist-info → openepd-6.31.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=fhxfEyEurLvSfvQci-vb3njzl_lvhcLXiZrecCOaMU8,794
-openepd/__version__.py,sha256=enRsBfml2NzBafBOFfvlU90PUt0sxIWFr532d5FuVvU,639
+openepd/__version__.py,sha256=RP90yLyA0fimq3bkON2BWP9vB79LaYyadZfDCC33-SA,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=_eZt_jGVL1a3p9cr-EF39Ve9Vl5sB8zwzTc_slnRL50,7975
@@ -57,12 +57,12 @@ openepd/model/lcia.py,sha256=PdaSZz02PMBJl_t2B_dmkcbzIFjA7iACrWj1fllHfw0,26230
 openepd/model/org.py,sha256=zxBt-c2f1nhJUqygUzhsq6AEEwfNiYGquhgYvcUfvSo,7771
 openepd/model/pcr.py,sha256=7nf6ATofdrlPt81vdU6p0E8n_ftFEuCEIKxtYlFwclw,5476
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
-openepd/model/specs/__init__.py,sha256=toVWd8_jxmAf7gRwpoXQpLfZW6Cl-NwveoduMXhECms,3903
+openepd/model/specs/__init__.py,sha256=YbyiLnQRQIX9mEdfQRVP3Rp1q3iNwujQMBbDK2-CYdM,3836
 openepd/model/specs/asphalt.py,sha256=eHhcITbBrNYR5N6x4Q2BxpsR64BR9OkjJ4bvPRYOqMg,3411
 openepd/model/specs/base.py,sha256=10IDyRFKQgFnyIPSqpeayP8Og1BDgs1EepXX5dyCMM4,2674
 openepd/model/specs/concrete.py,sha256=D9jbhZDtTXNBoAgljQBPxsmGsMvLSIAP5H53ZYiXcGI,5336
 openepd/model/specs/enums.py,sha256=6vNIDqt2kI-JKp9EBP9vhis935tfAS31znZ7v7LHb8s,63083
-openepd/model/specs/range/__init__.py,sha256=MlECuiVIB3QBrcc-J_iQgqztD-Kp9mMFiacQoDzKliA,5202
+openepd/model/specs/range/__init__.py,sha256=iYCY7RWHntcuE_AbVunU7jft_EFDG0tqvBiITndGRhs,5494
 openepd/model/specs/range/accessories.py,sha256=hZYz8mvAqrfLFiOIZ9qQZ59zmEiu0xE61Ko9cQ7NSKU,2498
 openepd/model/specs/range/aggregates.py,sha256=udVbsYc1Lyrd6a4YZBGNDQ3sBi-L3WLub_e1ecq7U-Q,2549
 openepd/model/specs/range/aluminium.py,sha256=Z3laZKXoPtfmOLLr4c4uf7Z-8TNmfz51X-_yd7GQIj8,2745
@@ -73,7 +73,7 @@ openepd/model/specs/range/cladding.py,sha256=r7M2lc77NR2GXBkgkqRzskQ6TdZeMd7pEEm
 openepd/model/specs/range/cmu.py,sha256=Sv4yw6121LSgYhW4J82xKsIi1KucaeDVF7xmpZtoCt8,1833
 openepd/model/specs/range/concrete.py,sha256=CwRJ_0lJ6zRFwaiom3jrp50BSTiB9mIGL3ujcygZwfs,7528
 openepd/model/specs/range/conveying_equipment.py,sha256=_rqJ9Y3kkP8E6-vkZb6Pih3JnR1nUESJoOLf-LT--sc,3176
-openepd/model/specs/range/electrical.py,sha256=EI8pv9SN4lJbFNz1wlyMNAjkA0dsi84pc2J9YvtiwzY,11860
+openepd/model/specs/range/electrical.py,sha256=s8X-byhQCD68c_lHqAZ4hWPBSY6Or67p2rM-OIVOA1M,12100
 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=dcgX9Tv4U_Zki9nGcy6ykvyesDYAtS_CuD-7nf17kMQ,1736
@@ -91,7 +91,6 @@ openepd/model/specs/range/mixins/access_flooring_mixin.py,sha256=JEcvlmKv3R5dVIM
 openepd/model/specs/range/network_infrastructure.py,sha256=aqXEIGqFy0gNCM_ftd3J6aT3FZf9JlT0SBOImhdkTg0,8498
 openepd/model/specs/range/non_construction.py,sha256=PDJn1QKQR9wHYr-KtWIxji-41IKFSeMZUS1fSjy4QGU,1664
 openepd/model/specs/range/openings.py,sha256=4MeNkbMAhtcGbiG5lxHCSRSdJ4F42uBMSXp5XJFODj4,15590
-openepd/model/specs/range/other_electrical_equipment.py,sha256=H4tZHcHyR2uUYHn-bQfLC6hR4tynVp_7EJbiI-YpK7Y,1001
 openepd/model/specs/range/other_materials.py,sha256=EAKHR9VJAkoqHL0FL2x-7PBvBxDD07drqoVLhBlaYzw,5823
 openepd/model/specs/range/plumbing.py,sha256=jQKrKYGDR33uh3ffo6uVyt3xuSmexkkelfNh_-omNCg,5342
 openepd/model/specs/range/precast_concrete.py,sha256=nn1U1XwKqqzY1cOPP3KqHZMJq4Ut9RAox4SMVYBa5B8,3763
@@ -101,7 +100,7 @@ openepd/model/specs/range/thermal_moisture_protection.py,sha256=aUpStISG2snc8aZ7
 openepd/model/specs/range/utility_piping.py,sha256=mQTrKbMTES_0Yta9DBnKehsmA2BAN_zYF_uPZCTKLPo,2665
 openepd/model/specs/range/wood.py,sha256=ZMStFsFOw5d6tCL2P7kksBnlYhwfvWJBZqoAdqSIUDg,6917
 openepd/model/specs/range/wood_joists.py,sha256=NCBHL0gdKwdKlGCP6up_Royl9BtWUUeuFfS1r2vIZ30,1785
-openepd/model/specs/singular/__init__.py,sha256=omwiL0I3e5SatFB2l3sJk8qqhi819HY7_Ja9T8Ny55w,12028
+openepd/model/specs/singular/__init__.py,sha256=MY2G6zLbJOQuKHKBGflo6BaUcB8rG-UGk-Cc_IHDR5A,12232
 openepd/model/specs/singular/accessories.py,sha256=xcuSJrG84oTm_w76_wlv_sItfK36gSyDmUD2TnpZnVE,2013
 openepd/model/specs/singular/aggregates.py,sha256=oSfArxvLUj63w_U0tZViRyiOpMRRjE72ncy2BimKxco,2934
 openepd/model/specs/singular/aluminium.py,sha256=7Z3WmuW22o92cPHfR6X_OBSoer0V5llwiNdQmWgKTx8,2408
@@ -116,7 +115,7 @@ openepd/model/specs/singular/conveying_equipment.py,sha256=AK_KdGyBDh0_Dl3YCkIyf
 openepd/model/specs/singular/deprecated/__init__.py,sha256=f8I04fHO5QWpNtorrCgbUXz4r0B0zgsk8zDUfXu_i80,2635
 openepd/model/specs/singular/deprecated/concrete.py,sha256=swSOfViIvy7z923C6uHBcIZrv_JRMv7wSJHpg9PGAJg,5265
 openepd/model/specs/singular/deprecated/steel.py,sha256=0A3Y50XpLsPt105t_H8BzByaDUbLoX1o_QIr566JfB4,3499
-openepd/model/specs/singular/electrical.py,sha256=BiaPpZBGBzUt5wVacd1tOIZ9dRn9ZAKFg582UfNnmyI,11113
+openepd/model/specs/singular/electrical.py,sha256=UOXVL6ri5b05O1-5YB1us-8QeBlHrTeRr21qjFrH6TM,11313
 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=tf9lHxb5Mj9Sf3WGjR1wq-mKcyqlvvVKpZG2W6cLcxo,1711
@@ -135,7 +134,6 @@ openepd/model/specs/singular/mixins/conduit_mixin.py,sha256=tj6p-MF84rg4LGxXPC65
 openepd/model/specs/singular/network_infrastructure.py,sha256=eB3p1zu1u15Ly5iuyyJ4xl3Z1GuBCRVU18Wpz8FWZrg,8521
 openepd/model/specs/singular/non_construction.py,sha256=VW_dP5I8AUkwa923d2r9X8S78k6OUA5rU0UAypUX8t8,1634
 openepd/model/specs/singular/openings.py,sha256=IoLBp003qvWZOeTeIPtVPcq4AXdY3ZSSzRK10mnnJac,19183
-openepd/model/specs/singular/other_electrical_equipment.py,sha256=FX7p4rMuUbTrz1yDwKkS-Z6odohoq-zCw6SU3Kw5ISs,814
 openepd/model/specs/singular/other_materials.py,sha256=iD_AeC8vHXAQuvw62TrVOyoRS6uy5LFb_2PSODDn2hk,4759
 openepd/model/specs/singular/plumbing.py,sha256=fHmKyy1aQxu8NZ3RTwxuA0CCERMgwVUdMA74kMDVc8o,4568
 openepd/model/specs/singular/precast_concrete.py,sha256=W2tKf0vOnAdfeGc1n7Pk8yx9jy44afdFB0cbwHjw1HI,7327
@@ -158,7 +156,7 @@ openepd/utils/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/utils/functional.py,sha256=sm7od2_UE-cNToezBlwFQ1TCUJub1tz6VykA1X8XH-I,1274
 openepd/utils/mapping/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/utils/mapping/common.py,sha256=WphCzwQQlzX11tUk88Ubyq3QPBLvH0tBPSIuH0kmiug,7339
-openepd-6.30.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.30.0.dist-info/METADATA,sha256=m6zAhESjdLnk1hSXRpMSGpcwo677rI9_eunN1Qvlni0,9827
-openepd-6.30.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openepd-6.30.0.dist-info/RECORD,,
+openepd-6.31.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.31.0.dist-info/METADATA,sha256=sPFX7iPzgiEauVaalAsCm0JvfOq9naQKVhi_Xt8npuM,9827
+openepd-6.31.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openepd-6.31.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"