From 0abe698c60e8ef696651bb26d058722b1bd315ac Mon Sep 17 00:00:00 2001 From: Anthony Charlton Date: Mon, 3 Aug 2026 15:31:33 +1000 Subject: [PATCH] Renamed source package `dataclass_descriptors` -> `boilerplate` in prep for boilerplate changes (test remains unchanged) Signed-off-by: Anthony Charlton --- src/zepben/ewb/__init__.py | 4 ++-- .../ewb/{dataclass_descriptors => boilerplate}/MANIFESTO.md | 0 .../ewb/{dataclass_descriptors => boilerplate}/__init__.py | 0 .../descriptor_fix.py => boilerplate/backed_descriptor.py} | 0 .../{dataclass_descriptors => boilerplate}/dataclass_base.py | 0 .../ewb/model/cim/extensions/iec61968/assetinfo/relay_info.py | 2 +- .../iec61968/metering/pan_demand_reponse_function.py | 2 +- .../model/cim/extensions/iec61970/base/core/hv_customer.py | 2 +- .../ewb/model/cim/extensions/iec61970/base/core/site.py | 2 +- .../ewb/model/cim/extensions/iec61970/base/feeder/loop.py | 2 +- .../model/cim/extensions/iec61970/base/feeder/lv_feeder.py | 2 +- .../cim/extensions/iec61970/base/feeder/lv_substation.py | 2 +- .../iec61970/base/generation/production/ev_charging_unit.py | 2 +- .../iec61970/base/protection/directional_current_relay.py | 2 +- .../cim/extensions/iec61970/base/protection/distance_relay.py | 2 +- .../iec61970/base/protection/protection_relay_function.py | 2 +- .../iec61970/base/protection/protection_relay_scheme.py | 2 +- .../iec61970/base/protection/protection_relay_system.py | 2 +- .../cim/extensions/iec61970/base/protection/voltage_relay.py | 2 +- .../cim/extensions/iec61970/base/wires/battery_control.py | 2 +- src/zepben/ewb/model/cim/iec61968/assetinfo/cable_info.py | 2 +- src/zepben/ewb/model/cim/iec61968/assetinfo/no_load_test.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/open_circuit_test.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/overhead_wire_info.py | 2 +- .../model/cim/iec61968/assetinfo/power_transformer_info.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/short_circuit_test.py | 2 +- .../model/cim/iec61968/assetinfo/shunt_compensator_info.py | 2 +- src/zepben/ewb/model/cim/iec61968/assetinfo/switch_info.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/transformer_end_info.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/transformer_tank_info.py | 2 +- .../ewb/model/cim/iec61968/assetinfo/transformer_test.py | 2 +- src/zepben/ewb/model/cim/iec61968/assetinfo/wire_info.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/asset.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/asset_container.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/asset_function.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/asset_info.py | 2 +- .../ewb/model/cim/iec61968/assets/asset_organisation_role.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/asset_owner.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/streetlight.py | 2 +- src/zepben/ewb/model/cim/iec61968/assets/structure.py | 2 +- src/zepben/ewb/model/cim/iec61968/common/agreement.py | 2 +- src/zepben/ewb/model/cim/iec61968/common/document.py | 2 +- src/zepben/ewb/model/cim/iec61968/common/location.py | 2 +- src/zepben/ewb/model/cim/iec61968/common/organisation.py | 2 +- src/zepben/ewb/model/cim/iec61968/common/organisation_role.py | 2 +- src/zepben/ewb/model/cim/iec61968/customers/customer.py | 2 +- .../ewb/model/cim/iec61968/customers/customer_agreement.py | 2 +- .../ewb/model/cim/iec61968/customers/pricing_structure.py | 2 +- src/zepben/ewb/model/cim/iec61968/customers/tariff.py | 2 +- .../infiec61968/infassetinfo/current_transformer_info.py | 2 +- .../infiec61968/infassetinfo/potential_transformer_info.py | 2 +- .../ewb/model/cim/iec61968/infiec61968/infassets/pole.py | 2 +- src/zepben/ewb/model/cim/iec61968/metering/end_device.py | 2 +- .../ewb/model/cim/iec61968/metering/end_device_function.py | 2 +- src/zepben/ewb/model/cim/iec61968/metering/meter.py | 2 +- src/zepben/ewb/model/cim/iec61968/metering/usage_point.py | 2 +- .../model/cim/iec61968/operations/operational_restriction.py | 2 +- .../iec61970/base/auxiliaryequipment/auxiliary_equipment.py | 2 +- .../iec61970/base/auxiliaryequipment/current_transformer.py | 2 +- .../cim/iec61970/base/auxiliaryequipment/fault_indicator.py | 2 +- .../iec61970/base/auxiliaryequipment/potential_transformer.py | 2 +- .../ewb/model/cim/iec61970/base/auxiliaryequipment/sensor.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/ac_dc_terminal.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/base_voltage.py | 2 +- .../ewb/model/cim/iec61970/base/core/conducting_equipment.py | 2 +- .../ewb/model/cim/iec61970/base/core/connectivity_node.py | 2 +- .../cim/iec61970/base/core/connectivity_node_container.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/curve.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/equipment.py | 2 +- .../ewb/model/cim/iec61970/base/core/equipment_container.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/feeder.py | 2 +- .../ewb/model/cim/iec61970/base/core/geographical_region.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/identifiable.py | 2 +- .../ewb/model/cim/iec61970/base/core/identified_object.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/name.py | 4 ++-- src/zepben/ewb/model/cim/iec61970/base/core/name_type.py | 4 ++-- .../ewb/model/cim/iec61970/base/core/power_system_resource.py | 2 +- .../model/cim/iec61970/base/core/sub_geographical_region.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/substation.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/core/terminal.py | 2 +- .../ewb/model/cim/iec61970/base/diagramlayout/diagram.py | 2 +- .../model/cim/iec61970/base/diagramlayout/diagram_object.py | 2 +- .../model/cim/iec61970/base/equivalents/equivalent_branch.py | 2 +- .../cim/iec61970/base/equivalents/equivalent_equipment.py | 2 +- .../cim/iec61970/base/generation/production/battery_unit.py | 2 +- .../iec61970/base/generation/production/photo_voltaic_unit.py | 2 +- .../base/generation/production/power_electronics_unit.py | 2 +- .../base/generation/production/power_electronics_wind_unit.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/accumulator.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/analog.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/control.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/discrete.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/iopoint.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/meas/measurement.py | 2 +- .../ewb/model/cim/iec61970/base/protection/current_relay.py | 2 +- .../ewb/model/cim/iec61970/base/scada/remote_control.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/scada/remote_point.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/scada/remote_source.py | 2 +- .../ewb/model/cim/iec61970/base/wires/ac_line_segment.py | 2 +- .../model/cim/iec61970/base/wires/ac_line_segment_phase.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/breaker.py | 2 +- .../ewb/model/cim/iec61970/base/wires/busbar_section.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/clamp.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/connector.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/cut.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/disconnector.py | 2 +- .../model/cim/iec61970/base/wires/earth_fault_compensator.py | 2 +- .../ewb/model/cim/iec61970/base/wires/energy_connection.py | 2 +- .../ewb/model/cim/iec61970/base/wires/energy_consumer.py | 2 +- .../model/cim/iec61970/base/wires/energy_consumer_phase.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py | 2 +- .../ewb/model/cim/iec61970/base/wires/energy_source_phase.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/fuse.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/ground.py | 2 +- .../ewb/model/cim/iec61970/base/wires/ground_disconnector.py | 2 +- .../ewb/model/cim/iec61970/base/wires/grounding_impedance.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/jumper.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/junction.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/line.py | 2 +- .../model/cim/iec61970/base/wires/linear_shunt_compensator.py | 2 +- .../ewb/model/cim/iec61970/base/wires/load_break_switch.py | 2 +- .../ewb/model/cim/iec61970/base/wires/per_length_impedance.py | 2 +- .../cim/iec61970/base/wires/per_length_line_parameter.py | 2 +- .../cim/iec61970/base/wires/per_length_phase_impedance.py | 2 +- .../cim/iec61970/base/wires/per_length_sequence_impedance.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/petersen_coil.py | 2 +- .../cim/iec61970/base/wires/power_electronics_connection.py | 2 +- .../iec61970/base/wires/power_electronics_connection_phase.py | 2 +- .../ewb/model/cim/iec61970/base/wires/power_transformer.py | 2 +- .../model/cim/iec61970/base/wires/power_transformer_end.py | 2 +- .../ewb/model/cim/iec61970/base/wires/protected_switch.py | 2 +- .../ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py | 2 +- .../cim/iec61970/base/wires/reactive_capability_curve.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/recloser.py | 2 +- .../ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py | 2 +- .../ewb/model/cim/iec61970/base/wires/regulating_control.py | 2 +- .../ewb/model/cim/iec61970/base/wires/rotating_machine.py | 2 +- .../ewb/model/cim/iec61970/base/wires/series_compensator.py | 2 +- .../ewb/model/cim/iec61970/base/wires/shunt_compensator.py | 2 +- .../model/cim/iec61970/base/wires/static_var_compensator.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/switch.py | 2 +- .../ewb/model/cim/iec61970/base/wires/synchronous_machine.py | 2 +- src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer.py | 2 +- .../ewb/model/cim/iec61970/base/wires/tap_changer_control.py | 2 +- .../ewb/model/cim/iec61970/base/wires/transformer_end.py | 2 +- .../cim/iec61970/base/wires/transformer_star_impedance.py | 2 +- .../ewb/model/cim/iec61970/infiec61970/feeder/circuit.py | 2 +- .../network/tracing/connectivity/connectivity_result.py | 2 +- src/zepben/ewb/streaming/grpc/grpc.py | 2 +- test/dataclass_descriptors/test_basic_descriptor.py | 4 ++-- test/dataclass_descriptors/test_dataclass_base.py | 4 ++-- .../networktrace/test_network_trace_step_path_provider.py | 2 +- 153 files changed, 154 insertions(+), 154 deletions(-) rename src/zepben/ewb/{dataclass_descriptors => boilerplate}/MANIFESTO.md (100%) rename src/zepben/ewb/{dataclass_descriptors => boilerplate}/__init__.py (100%) rename src/zepben/ewb/{dataclass_descriptors/descriptor_fix.py => boilerplate/backed_descriptor.py} (100%) rename src/zepben/ewb/{dataclass_descriptors => boilerplate}/dataclass_base.py (100%) diff --git a/src/zepben/ewb/__init__.py b/src/zepben/ewb/__init__.py index 3db0b2d5d..bb5bd2339 100644 --- a/src/zepben/ewb/__init__.py +++ b/src/zepben/ewb/__init__.py @@ -13,8 +13,8 @@ from zepben.ewb.auth.client.zepben_token_fetcher import * from zepben.ewb.auth.common.auth_exception import * from zepben.ewb.auth.common.auth_method import * -from zepben.ewb.dataclass_descriptors.dataclass_base import * -from zepben.ewb.dataclass_descriptors.descriptor_fix import * +from zepben.ewb.boilerplate.dataclass_base import * +from zepben.ewb.boilerplate.backed_descriptor import * from zepben.ewb.util import * ############# diff --git a/src/zepben/ewb/dataclass_descriptors/MANIFESTO.md b/src/zepben/ewb/boilerplate/MANIFESTO.md similarity index 100% rename from src/zepben/ewb/dataclass_descriptors/MANIFESTO.md rename to src/zepben/ewb/boilerplate/MANIFESTO.md diff --git a/src/zepben/ewb/dataclass_descriptors/__init__.py b/src/zepben/ewb/boilerplate/__init__.py similarity index 100% rename from src/zepben/ewb/dataclass_descriptors/__init__.py rename to src/zepben/ewb/boilerplate/__init__.py diff --git a/src/zepben/ewb/dataclass_descriptors/descriptor_fix.py b/src/zepben/ewb/boilerplate/backed_descriptor.py similarity index 100% rename from src/zepben/ewb/dataclass_descriptors/descriptor_fix.py rename to src/zepben/ewb/boilerplate/backed_descriptor.py diff --git a/src/zepben/ewb/dataclass_descriptors/dataclass_base.py b/src/zepben/ewb/boilerplate/dataclass_base.py similarity index 100% rename from src/zepben/ewb/dataclass_descriptors/dataclass_base.py rename to src/zepben/ewb/boilerplate/dataclass_base.py diff --git a/src/zepben/ewb/model/cim/extensions/iec61968/assetinfo/relay_info.py b/src/zepben/ewb/model/cim/extensions/iec61968/assetinfo/relay_info.py index 1422e7455..1936a7f02 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61968/assetinfo/relay_info.py +++ b/src/zepben/ewb/model/cim/extensions/iec61968/assetinfo/relay_info.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.util import ngen, nlen, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61968/metering/pan_demand_reponse_function.py b/src/zepben/ewb/model/cim/extensions/iec61968/metering/pan_demand_reponse_function.py index de788d02f..16c669dc1 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61968/metering/pan_demand_reponse_function.py +++ b/src/zepben/ewb/model/cim/extensions/iec61968/metering/pan_demand_reponse_function.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61968.metering.end_device_function import EndDeviceFunction from zepben.ewb.model.cim.iec61968.metering.end_device_function_kind import EndDeviceFunctionKind from zepben.ewb.util import require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/core/hv_customer.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/core/hv_customer.py index 1e6114845..becd2615c 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/core/hv_customer.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/core/hv_customer.py @@ -7,7 +7,7 @@ from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer from zepben.ewb.model.cim.extensions.zbex import zbex -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/core/site.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/core/site.py index b7148b6c1..7723ee17a 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/core/site.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/core/site.py @@ -7,7 +7,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/loop.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/loop.py index f45014aa1..523435c10 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/loop.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/loop.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import safe_remove, ngen, nlen, get_by_mrid -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.substation import Substation diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py index e41f23369..f03a6e156 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer from zepben.ewb.util import safe_remove_by_id, nlen, ngen -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if typing.TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_substation.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_substation.py index 8d203e09a..9afc8a44e 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_substation.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_substation.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer from zepben.ewb.model.cim.extensions.iec61970.base.feeder.lv_feeder import LvFeeder -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/generation/production/ev_charging_unit.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/generation/production/ev_charging_unit.py index 622acbf1c..f2c8fc7ff 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/generation/production/ev_charging_unit.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/generation/production/ev_charging_unit.py @@ -7,7 +7,7 @@ from zepben.ewb.model.cim.iec61970.base.generation.production.power_electronics_unit import PowerElectronicsUnit from zepben.ewb.model.cim.extensions.zbex import zbex -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/directional_current_relay.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/directional_current_relay.py index 69cbfe732..0deac4622 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/directional_current_relay.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/directional_current_relay.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61970.base.core.phase_code import PhaseCode from zepben.ewb.model.cim.extensions.iec61970.base.protection.polarizing_quantity_type import PolarizingQuantityType from zepben.ewb.model.cim.extensions.zbex import zbex -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/distance_relay.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/distance_relay.py index ca63148d8..33462a8fe 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/distance_relay.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/distance_relay.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction from zepben.ewb.model.cim.extensions.zbex import zbex -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_function.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_function.py index 0dc128bfb..cd0eb9908 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_function.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_function.py @@ -16,7 +16,7 @@ else: from typing_extensions import deprecated -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.extensions.iec61970.base.protection.power_direction_kind import PowerDirectionKind from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_kind import ProtectionKind from zepben.ewb.model.cim.extensions.zbex import zbex diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_scheme.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_scheme.py index 8895badfe..2d6a42987 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_scheme.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_scheme.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import ngen, get_by_mrid, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_system import ProtectionRelaySystem diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_system.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_system.py index 83c1ae601..d0245a0e2 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_system.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/protection_relay_system.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment from zepben.ewb.util import ngen, get_by_mrid, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_scheme import ProtectionRelayScheme diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/voltage_relay.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/voltage_relay.py index cf119993e..aca21b9da 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/voltage_relay.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/protection/voltage_relay.py @@ -8,7 +8,7 @@ from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction from zepben.ewb.model.cim.extensions.zbex import zbex -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control.py index 47fe8fe45..243603e8d 100644 --- a/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control.py +++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/wires/battery_control.py @@ -10,7 +10,7 @@ from zepben.ewb.model.cim.extensions.iec61970.base.wires.battery_control_mode import BatteryControlMode from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.wires.regulating_control import RegulatingControl -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/cable_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/cable_info.py index daa52d17f..a8bf9abe8 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/cable_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/cable_info.py @@ -6,7 +6,7 @@ __all__ = ["CableInfo"] from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/no_load_test.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/no_load_test.py index 0d57e928f..be6a5b632 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/no_load_test.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/no_load_test.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.assetinfo.transformer_test import TransformerTest -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/open_circuit_test.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/open_circuit_test.py index 09a0ff2fc..90874bb4c 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/open_circuit_test.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/open_circuit_test.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.assetinfo.transformer_test import TransformerTest -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/overhead_wire_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/overhead_wire_info.py index be3ccf9f9..587c99011 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/overhead_wire_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/overhead_wire_info.py @@ -6,7 +6,7 @@ __all__ = ["OverheadWireInfo"] from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/power_transformer_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/power_transformer_info.py index eb939df8f..c774d5006 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/power_transformer_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/power_transformer_info.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.model.resistance_reactance import ResistanceReactance from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assetinfo.transformer_tank_info import TransformerTankInfo diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/short_circuit_test.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/short_circuit_test.py index cf347b3c1..0704648de 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/short_circuit_test.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/short_circuit_test.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.assetinfo.transformer_test import TransformerTest -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/shunt_compensator_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/shunt_compensator_info.py index 4033d3a00..273e3f65d 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/shunt_compensator_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/shunt_compensator_info.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/switch_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/switch_info.py index de848c078..68c0ae33c 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/switch_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/switch_info.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_end_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_end_info.py index 3d572fd2d..15b95921f 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_end_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_end_info.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.model.cim.iec61970.base.wires.winding_connection import WindingConnection from zepben.ewb.model.resistance_reactance import ResistanceReactance -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assetinfo.no_load_test import NoLoadTest diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_tank_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_tank_info.py index 79d84f371..1d827d563 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_tank_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_tank_info.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.model.resistance_reactance import ResistanceReactance from zepben.ewb.util import nlen, ngen, safe_remove, get_by_mrid -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assetinfo.power_transformer_info import PowerTransformerInfo diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_test.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_test.py index 0bac019b3..7909ba2b1 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_test.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/transformer_test.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_info.py b/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_info.py index cce3ec5e2..2e4e26c5e 100644 --- a/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assetinfo/wire_info.py @@ -10,7 +10,7 @@ from zepben.ewb.model.cim.iec61968.assetinfo.wire_insulation_kind import WireInsulationKind from zepben.ewb.model.cim.iec61968.assetinfo.wire_material_kind import WireMaterialKind from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset.py b/src/zepben/ewb/model/cim/iec61968/assets/asset.py index ce0e138f4..9ca727541 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import get_by_mrid, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assets.asset_organisation_role import AssetOrganisationRole diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset_container.py b/src/zepben/ewb/model/cim/iec61968/assets/asset_container.py index 72b494166..dda814866 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset_container.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset_container.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61968.assets.asset import Asset -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset_function.py b/src/zepben/ewb/model/cim/iec61968/assets/asset_function.py index 989bce7f6..a02073b7d 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset_function.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset_function.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset_info.py b/src/zepben/ewb/model/cim/iec61968/assets/asset_info.py index 49712ba99..0e9a1e69b 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset_info.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset_info.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset_organisation_role.py b/src/zepben/ewb/model/cim/iec61968/assets/asset_organisation_role.py index 22d5370f1..59d882d97 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset_organisation_role.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset_organisation_role.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61968.common.organisation_role import OrganisationRole -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/asset_owner.py b/src/zepben/ewb/model/cim/iec61968/assets/asset_owner.py index f65cdd3df..6898e3ff7 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/asset_owner.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/asset_owner.py @@ -6,7 +6,7 @@ __all__ = ["AssetOwner"] from zepben.ewb.model.cim.iec61968.assets.asset_organisation_role import AssetOrganisationRole -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/assets/streetlight.py b/src/zepben/ewb/model/cim/iec61968/assets/streetlight.py index cd797c94f..dd4b280c1 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/streetlight.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/streetlight.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset import Asset from zepben.ewb.model.cim.iec61968.infiec61968.infassets.streetlight_lamp_kind import StreetlightLampKind -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.infiec61968.infassets.pole import Pole diff --git a/src/zepben/ewb/model/cim/iec61968/assets/structure.py b/src/zepben/ewb/model/cim/iec61968/assets/structure.py index 1cc64eabd..5e68bdb8d 100644 --- a/src/zepben/ewb/model/cim/iec61968/assets/structure.py +++ b/src/zepben/ewb/model/cim/iec61968/assets/structure.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61968.assets.asset_container import AssetContainer -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/common/agreement.py b/src/zepben/ewb/model/cim/iec61968/common/agreement.py index 01454a575..8234053c8 100644 --- a/src/zepben/ewb/model/cim/iec61968/common/agreement.py +++ b/src/zepben/ewb/model/cim/iec61968/common/agreement.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61968.common.document import Document from zepben.ewb.model.cim.iec61970.base.domain.date_time_interval import DateTimeInterval -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/common/document.py b/src/zepben/ewb/model/cim/iec61968/common/document.py index be8a37f93..e0a0cad5e 100644 --- a/src/zepben/ewb/model/cim/iec61968/common/document.py +++ b/src/zepben/ewb/model/cim/iec61968/common/document.py @@ -10,7 +10,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/common/location.py b/src/zepben/ewb/model/cim/iec61968/common/location.py index 361d964a7..cceb97065 100644 --- a/src/zepben/ewb/model/cim/iec61968/common/location.py +++ b/src/zepben/ewb/model/cim/iec61968/common/location.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61968.common.street_address import StreetAddress from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import require, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/common/organisation.py b/src/zepben/ewb/model/cim/iec61968/common/organisation.py index d639ccc8b..8c9af02f4 100644 --- a/src/zepben/ewb/model/cim/iec61968/common/organisation.py +++ b/src/zepben/ewb/model/cim/iec61968/common/organisation.py @@ -6,7 +6,7 @@ __all__ = ["Organisation"] from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/common/organisation_role.py b/src/zepben/ewb/model/cim/iec61968/common/organisation_role.py index cb6f981b4..2f81ea37f 100644 --- a/src/zepben/ewb/model/cim/iec61968/common/organisation_role.py +++ b/src/zepben/ewb/model/cim/iec61968/common/organisation_role.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.common.organisation import Organisation diff --git a/src/zepben/ewb/model/cim/iec61968/customers/customer.py b/src/zepben/ewb/model/cim/iec61968/customers/customer.py index 1fd03ab43..f1425e257 100644 --- a/src/zepben/ewb/model/cim/iec61968/customers/customer.py +++ b/src/zepben/ewb/model/cim/iec61968/customers/customer.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61968.common.organisation_role import OrganisationRole from zepben.ewb.model.cim.iec61968.customers.customer_kind import CustomerKind from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.customers.customer_agreement import CustomerAgreement diff --git a/src/zepben/ewb/model/cim/iec61968/customers/customer_agreement.py b/src/zepben/ewb/model/cim/iec61968/customers/customer_agreement.py index 836c36b02..4bfaf89da 100644 --- a/src/zepben/ewb/model/cim/iec61968/customers/customer_agreement.py +++ b/src/zepben/ewb/model/cim/iec61968/customers/customer_agreement.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61968.common.agreement import Agreement from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.customers.customer import Customer diff --git a/src/zepben/ewb/model/cim/iec61968/customers/pricing_structure.py b/src/zepben/ewb/model/cim/iec61968/customers/pricing_structure.py index dc8202907..55070f585 100644 --- a/src/zepben/ewb/model/cim/iec61968/customers/pricing_structure.py +++ b/src/zepben/ewb/model/cim/iec61968/customers/pricing_structure.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61968.common.document import Document from zepben.ewb.util import get_by_mrid, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.customers.tariff import Tariff diff --git a/src/zepben/ewb/model/cim/iec61968/customers/tariff.py b/src/zepben/ewb/model/cim/iec61968/customers/tariff.py index 15d68f4e7..48cbcdd5f 100644 --- a/src/zepben/ewb/model/cim/iec61968/customers/tariff.py +++ b/src/zepben/ewb/model/cim/iec61968/customers/tariff.py @@ -6,7 +6,7 @@ __all__ = ["Tariff"] from zepben.ewb.model.cim.iec61968.common.document import Document -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/current_transformer_info.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/current_transformer_info.py index 03eda1131..9487750bd 100644 --- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/current_transformer_info.py +++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/current_transformer_info.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.model.cim.iec61968.infiec61968.infcommon.ratio import Ratio -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/potential_transformer_info.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/potential_transformer_info.py index d6cbed26e..1dc3f4939 100644 --- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/potential_transformer_info.py +++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassetinfo/potential_transformer_info.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_info import AssetInfo from zepben.ewb.model.cim.iec61968.infiec61968.infcommon.ratio import Ratio -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/pole.py b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/pole.py index df77d8465..2a6b1c6b9 100644 --- a/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/pole.py +++ b/src/zepben/ewb/model/cim/iec61968/infiec61968/infassets/pole.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61968.assets.structure import Structure from zepben.ewb.util import get_by_mrid, ngen, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assets.streetlight import Streetlight diff --git a/src/zepben/ewb/model/cim/iec61968/metering/end_device.py b/src/zepben/ewb/model/cim/iec61968/metering/end_device.py index fcd5210da..59bd836e1 100644 --- a/src/zepben/ewb/model/cim/iec61968/metering/end_device.py +++ b/src/zepben/ewb/model/cim/iec61968/metering/end_device.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61968.assets.asset_container import AssetContainer from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.common.location import Location diff --git a/src/zepben/ewb/model/cim/iec61968/metering/end_device_function.py b/src/zepben/ewb/model/cim/iec61968/metering/end_device_function.py index 1a23fad6d..75a768f1e 100644 --- a/src/zepben/ewb/model/cim/iec61968/metering/end_device_function.py +++ b/src/zepben/ewb/model/cim/iec61968/metering/end_device_function.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61968.assets.asset_function import AssetFunction -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/metering/meter.py b/src/zepben/ewb/model/cim/iec61968/metering/meter.py index ad972e4b5..562e92440 100644 --- a/src/zepben/ewb/model/cim/iec61968/metering/meter.py +++ b/src/zepben/ewb/model/cim/iec61968/metering/meter.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61968.metering.end_device import EndDevice -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61968/metering/usage_point.py b/src/zepben/ewb/model/cim/iec61968/metering/usage_point.py index 764e395cf..40a2c2cc7 100644 --- a/src/zepben/ewb/model/cim/iec61968/metering/usage_point.py +++ b/src/zepben/ewb/model/cim/iec61968/metering/usage_point.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.model.cim.iec61970.base.core.phase_code import PhaseCode from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.common.location import Location diff --git a/src/zepben/ewb/model/cim/iec61968/operations/operational_restriction.py b/src/zepben/ewb/model/cim/iec61968/operations/operational_restriction.py index ec66ae712..4ce33da14 100644 --- a/src/zepben/ewb/model/cim/iec61968/operations/operational_restriction.py +++ b/src/zepben/ewb/model/cim/iec61968/operations/operational_restriction.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61968.common.document import Document from zepben.ewb.util import get_by_mrid, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/auxiliary_equipment.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/auxiliary_equipment.py index beedf8a74..c013c5a49 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/auxiliary_equipment.py +++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/auxiliary_equipment.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.terminal import Terminal diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/current_transformer.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/current_transformer.py index b5bee6f7d..e9e15461d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/current_transformer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/current_transformer.py @@ -12,7 +12,7 @@ else: from typing_extensions import deprecated -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.sensor import Sensor if TYPE_CHECKING: diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/fault_indicator.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/fault_indicator.py index b7474b8ab..fa3ed533e 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/fault_indicator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/fault_indicator.py @@ -6,7 +6,7 @@ __all__ = ["FaultIndicator"] from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.auxiliary_equipment import AuxiliaryEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer.py index 6392d4a29..72f1a0bb1 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/potential_transformer.py @@ -12,7 +12,7 @@ else: from typing_extensions import deprecated -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.potential_transformer_kind import PotentialTransformerKind from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.sensor import Sensor diff --git a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/sensor.py b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/sensor.py index 8c65ffb3e..6299e06ae 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/sensor.py +++ b/src/zepben/ewb/model/cim/iec61970/base/auxiliaryequipment/sensor.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.auxiliary_equipment import AuxiliaryEquipment from zepben.ewb.util import ngen, nlen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/ac_dc_terminal.py b/src/zepben/ewb/model/cim/iec61970/base/core/ac_dc_terminal.py index 50fdae902..1918844c2 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/ac_dc_terminal.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/ac_dc_terminal.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/base_voltage.py b/src/zepben/ewb/model/cim/iec61970/base/core/base_voltage.py index bad3800f0..b900bd8a3 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/base_voltage.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/base_voltage.py @@ -6,7 +6,7 @@ __all__ = ["BaseVoltage"] from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/conducting_equipment.py b/src/zepben/ewb/model/cim/iec61970/base/core/conducting_equipment.py index f93a0bf30..0a6124c59 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/conducting_equipment.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/conducting_equipment.py @@ -14,7 +14,7 @@ from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment from zepben.ewb.util import get_by_mrid, require, ngen -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.base_voltage import BaseVoltage diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node.py b/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node.py index 1251778e6..f900d551a 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import get_by_mrid, ngen -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.terminal import Terminal diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node_container.py b/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node_container.py index 8837a546f..689a0e9a4 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node_container.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/connectivity_node_container.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/curve.py b/src/zepben/ewb/model/cim/iec61970/base/core/curve.py index 73d4ab90b..175605f39 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/curve.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/curve.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.core.curve_data import CurveData from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import require, ngen, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/equipment.py b/src/zepben/ewb/model/cim/iec61970/base/core/equipment.py index b5443e4bf..a741c0752 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/equipment.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/equipment.py @@ -18,7 +18,7 @@ from zepben.ewb.model.cim.iec61970.base.core.substation import Substation from zepben.ewb.model.cim.extensions.iec61970.base.core.site import Site from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.metering.usage_point import UsagePoint diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/equipment_container.py b/src/zepben/ewb/model/cim/iec61970/base/core/equipment_container.py index 44c2f5172..6f7290e57 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/equipment_container.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/equipment_container.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.core.connectivity_node_container import ConnectivityNodeContainer from zepben.ewb.util import nlen, ngen, safe_remove_by_id -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.services.network.tracing.networktrace.operators.network_state_operators import NetworkStateOperators diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/feeder.py b/src/zepben/ewb/model/cim/iec61970/base/core/feeder.py index 8ca0e5aab..21f9dae7e 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/feeder.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/feeder.py @@ -15,7 +15,7 @@ from zepben.ewb.model.cim.extensions.zbex import zbex from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer from zepben.ewb.util import ngen, nlen, safe_remove_by_id -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.feeder.lv_substation import LvSubstation diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/geographical_region.py b/src/zepben/ewb/model/cim/iec61970/base/core/geographical_region.py index b0cf54b0a..801654734 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/geographical_region.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/geographical_region.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.model.cim.iec61970.base.core.sub_geographical_region import SubGeographicalRegion from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/identifiable.py b/src/zepben/ewb/model/cim/iec61970/base/core/identifiable.py index 57a6bfb07..1b5f09a51 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/identifiable.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/identifiable.py @@ -9,7 +9,7 @@ from typing import TypeVar, overload, Callable, Any from zepben.ewb import require -from zepben.ewb.dataclass_descriptors.dataclass_base import DataclassBase, zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import DataclassBase, zb_dataclass TIdentifiable = TypeVar('TIdentifiable') diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py b/src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py index b36c786a9..4c9b6c0a2 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py @@ -15,7 +15,7 @@ from zepben.ewb.model.cim.iec61970.base.core.name import Name from zepben.ewb.model.cim.iec61970.base.core.name_type import NameType from zepben.ewb.util import require, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass logger = logging.getLogger(__name__) diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/name.py b/src/zepben/ewb/model/cim/iec61970/base/core/name.py index 9bf14b350..05adcfda9 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/name.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/name.py @@ -9,8 +9,8 @@ from typing import TYPE_CHECKING, Optional -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass -from zepben.ewb.dataclass_descriptors.descriptor_fix import remove_descriptor_annotations +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.backed_descriptor import remove_descriptor_annotations from zepben.ewb.model.cim.iec61970.base.core.identifiable import Identifiable if TYPE_CHECKING: diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/name_type.py b/src/zepben/ewb/model/cim/iec61970/base/core/name_type.py index 78495bd0a..7e0231238 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/name_type.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/name_type.py @@ -12,8 +12,8 @@ from zepben.ewb.model.cim.iec61970.base.core.identifiable import Identifiable from zepben.ewb.model.cim.iec61970.base.core.name import Name -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass -from zepben.ewb.dataclass_descriptors.descriptor_fix import BackedDescriptor, remove_descriptor_annotations +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.backed_descriptor import BackedDescriptor, remove_descriptor_annotations if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/power_system_resource.py b/src/zepben/ewb/model/cim/iec61970/base/core/power_system_resource.py index 8d97f373e..6368c13ec 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/power_system_resource.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/power_system_resource.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import get_by_mrid, nlen, ngen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assets.asset import Asset diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/sub_geographical_region.py b/src/zepben/ewb/model/cim/iec61970/base/core/sub_geographical_region.py index 5a567be73..869eef810 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/sub_geographical_region.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/sub_geographical_region.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.geographical_region import GeographicalRegion diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/substation.py b/src/zepben/ewb/model/cim/iec61970/base/core/substation.py index 7aaeead62..ed515fe95 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/substation.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/substation.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.feeder.loop import Loop diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py b/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py index a7d43f2df..79668113d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py +++ b/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py @@ -19,7 +19,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.busbar_section import BusbarSection from zepben.ewb.services.network.tracing.feeder.feeder_direction import FeederDirection from zepben.ewb.services.network.tracing.phases.phase_status import PhaseStatus -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment diff --git a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram.py b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram.py index 7975de84e..9f48f929e 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram.py +++ b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_style import DiagramStyle from zepben.ewb.model.cim.iec61970.base.diagramlayout.orientation_kind import OrientationKind from zepben.ewb.util import nlen, ngen, require, safe_remove_by_id -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object import DiagramObject diff --git a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_object.py b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_object.py index 55f4e0bba..c4f5fdfe1 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_object.py +++ b/src/zepben/ewb/model/cim/iec61970/base/diagramlayout/diagram_object.py @@ -14,7 +14,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object_point import DiagramObjectPoint from zepben.ewb.util import nlen, ngen, require, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram import Diagram diff --git a/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_branch.py b/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_branch.py index ca457d53a..16926c532 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_branch.py +++ b/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_branch.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.equivalents.equivalent_equipment import EquivalentEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_equipment.py b/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_equipment.py index e4056d927..62f233d20 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_equipment.py +++ b/src/zepben/ewb/model/cim/iec61970/base/equivalents/equivalent_equipment.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_unit.py b/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_unit.py index a501e243c..c31fe2691 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_unit.py +++ b/src/zepben/ewb/model/cim/iec61970/base/generation/production/battery_unit.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.generation.production.battery_state_kind import BatteryStateKind from zepben.ewb.model.cim.iec61970.base.generation.production.power_electronics_unit import PowerElectronicsUnit from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.wires.battery_control import BatteryControl diff --git a/src/zepben/ewb/model/cim/iec61970/base/generation/production/photo_voltaic_unit.py b/src/zepben/ewb/model/cim/iec61970/base/generation/production/photo_voltaic_unit.py index 2d75d6e78..0a1789a03 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/generation/production/photo_voltaic_unit.py +++ b/src/zepben/ewb/model/cim/iec61970/base/generation/production/photo_voltaic_unit.py @@ -6,7 +6,7 @@ __all__ = ["PhotoVoltaicUnit"] from zepben.ewb.model.cim.iec61970.base.generation.production.power_electronics_unit import PowerElectronicsUnit -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_unit.py b/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_unit.py index 9154b4bce..7a9b7a0cf 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_unit.py +++ b/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_unit.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.power_electronics_connection import PowerElectronicsConnection diff --git a/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_wind_unit.py b/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_wind_unit.py index e7b6f2dc2..682a468d1 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_wind_unit.py +++ b/src/zepben/ewb/model/cim/iec61970/base/generation/production/power_electronics_wind_unit.py @@ -6,7 +6,7 @@ __all__ = ["PowerElectronicsWindUnit"] from zepben.ewb.model.cim.iec61970.base.generation.production.power_electronics_unit import PowerElectronicsUnit -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/accumulator.py b/src/zepben/ewb/model/cim/iec61970/base/meas/accumulator.py index d42d01505..4c60f7dc7 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/accumulator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/accumulator.py @@ -6,7 +6,7 @@ __all__ = ["Accumulator"] from zepben.ewb.model.cim.iec61970.base.meas.measurement import Measurement -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/analog.py b/src/zepben/ewb/model/cim/iec61970/base/meas/analog.py index 6b0c7abcb..9e347c2ae 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/analog.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/analog.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.meas.measurement import Measurement -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/control.py b/src/zepben/ewb/model/cim/iec61970/base/meas/control.py index 5898d4412..5dbc78e1f 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/control.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/control.py @@ -8,7 +8,7 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.meas.iopoint import IoPoint -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.scada.remote_control import RemoteControl diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/discrete.py b/src/zepben/ewb/model/cim/iec61970/base/meas/discrete.py index c9eafc92c..9d379be70 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/discrete.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/discrete.py @@ -6,7 +6,7 @@ __all__ = ["Discrete"] from zepben.ewb.model.cim.iec61970.base.meas.measurement import Measurement -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/iopoint.py b/src/zepben/ewb/model/cim/iec61970/base/meas/iopoint.py index 920044b1c..43a7d00e7 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/iopoint.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/iopoint.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/meas/measurement.py b/src/zepben/ewb/model/cim/iec61970/base/meas/measurement.py index a012eef2e..174ee4888 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/meas/measurement.py +++ b/src/zepben/ewb/model/cim/iec61970/base/meas/measurement.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.model.cim.iec61970.base.core.phase_code import PhaseCode from zepben.ewb.model.cim.iec61970.base.domain.unit_symbol import UnitSymbol -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.scada.remote_source import RemoteSource diff --git a/src/zepben/ewb/model/cim/iec61970/base/protection/current_relay.py b/src/zepben/ewb/model/cim/iec61970/base/protection/current_relay.py index b4482b6b1..4ac41a425 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/protection/current_relay.py +++ b/src/zepben/ewb/model/cim/iec61970/base/protection/current_relay.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_control.py b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_control.py index 1b2ccdcf2..f9192f500 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_control.py +++ b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_control.py @@ -8,7 +8,7 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.scada.remote_point import RemotePoint -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.meas.control import Control diff --git a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_point.py b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_point.py index 0c84afd1a..31c222c7b 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_point.py +++ b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_point.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_source.py b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_source.py index fcdc4c81e..1b840b89e 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/scada/remote_source.py +++ b/src/zepben/ewb/model/cim/iec61970/base/scada/remote_source.py @@ -8,7 +8,7 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.scada.remote_point import RemotePoint -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.meas.measurement import Measurement diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py index c98ed592d..c6734028d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.conductor import Conductor from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind from zepben.ewb.util import nlen, ngen, get_by_mrid, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment_phase.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment_phase.py index 4ca992a95..297c5a50d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment_phase.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment_phase.py @@ -14,7 +14,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.ac_line_segment import AcLineSegment diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/breaker.py b/src/zepben/ewb/model/cim/iec61970/base/wires/breaker.py index f448347b7..78adfe90b 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/breaker.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/breaker.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.protected_switch import ProtectedSwitch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/busbar_section.py b/src/zepben/ewb/model/cim/iec61970/base/wires/busbar_section.py index 276d0d215..578685c71 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/busbar_section.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/busbar_section.py @@ -6,7 +6,7 @@ __all__ = ["BusbarSection"] from zepben.ewb.model.cim.iec61970.base.wires.connector import Connector -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/clamp.py b/src/zepben/ewb/model/cim/iec61970/base/wires/clamp.py index f845a3c86..e7067475a 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/clamp.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/clamp.py @@ -10,7 +10,7 @@ from typing_extensions import deprecated from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.ac_line_segment import AcLineSegment diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py b/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py index 73a50dd1f..5bb75c75d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py @@ -9,7 +9,7 @@ from typing import Optional, TYPE_CHECKING from abc import ABCMeta -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if sys.version_info >= (3, 13): from warnings import deprecated else: diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/connector.py b/src/zepben/ewb/model/cim/iec61970/base/wires/connector.py index 36d8ec9b8..8d6d7051e 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/connector.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/connector.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/cut.py b/src/zepben/ewb/model/cim/iec61970/base/wires/cut.py index 2a9cd9e11..19d9f08bf 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/cut.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/cut.py @@ -10,7 +10,7 @@ from typing_extensions import deprecated from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.ac_line_segment import AcLineSegment diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/disconnector.py b/src/zepben/ewb/model/cim/iec61970/base/wires/disconnector.py index 9c77e0f2e..1c70d9e67 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/disconnector.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/disconnector.py @@ -6,7 +6,7 @@ __all__ = ["Disconnector"] from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/earth_fault_compensator.py b/src/zepben/ewb/model/cim/iec61970/base/wires/earth_fault_compensator.py index f8a161f7f..67034cde2 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/earth_fault_compensator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/earth_fault_compensator.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_connection.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_connection.py index ec73aaa6f..5097a9250 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_connection.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_connection.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer.py index b016c64ad..32247cf9c 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.energy_connection import EnergyConnection from zepben.ewb.model.cim.iec61970.base.wires.phase_shunt_connection_kind import PhaseShuntConnectionKind from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.energy_consumer_phase import EnergyConsumerPhase diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer_phase.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer_phase.py index fa7f3e222..a46682b4c 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer_phase.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_consumer_phase.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.energy_consumer import EnergyConsumer diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py index 5f8fdf13a..a544a2230 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.energy_connection import EnergyConnection from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove, require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.energy_source_phase import EnergySourcePhase diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source_phase.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source_phase.py index 1824b259e..a818d0eab 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source_phase.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source_phase.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.energy_source import EnergySource diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/fuse.py b/src/zepben/ewb/model/cim/iec61970/base/wires/fuse.py index 3f3a591a2..7bd4c3a17 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/fuse.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/fuse.py @@ -8,7 +8,7 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ground.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ground.py index 17aa87ef0..e7f40eabe 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/ground.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ground.py @@ -6,7 +6,7 @@ __all__ = ["Ground"] from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ground_disconnector.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ground_disconnector.py index dc08f3498..af35df889 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/ground_disconnector.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ground_disconnector.py @@ -6,7 +6,7 @@ __all__ = ["GroundDisconnector"] from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/grounding_impedance.py b/src/zepben/ewb/model/cim/iec61970/base/wires/grounding_impedance.py index 1f4587c53..e307f683a 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/grounding_impedance.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/grounding_impedance.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.earth_fault_compensator import EarthFaultCompensator -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/jumper.py b/src/zepben/ewb/model/cim/iec61970/base/wires/jumper.py index fb97c8cbc..642360974 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/jumper.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/jumper.py @@ -6,7 +6,7 @@ __all__ = ["Jumper"] from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/junction.py b/src/zepben/ewb/model/cim/iec61970/base/wires/junction.py index 540911f46..63f04fe4f 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/junction.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/junction.py @@ -6,7 +6,7 @@ __all__ = ["Junction"] from zepben.ewb.model.cim.iec61970.base.wires.connector import Connector -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/line.py b/src/zepben/ewb/model/cim/iec61970/base/wires/line.py index d11578f45..cf1113f2b 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/line.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/line.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.equipment_container import EquipmentContainer -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/linear_shunt_compensator.py b/src/zepben/ewb/model/cim/iec61970/base/wires/linear_shunt_compensator.py index 5ef1cc366..1443ab703 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/linear_shunt_compensator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/linear_shunt_compensator.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.shunt_compensator import ShuntCompensator -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/load_break_switch.py b/src/zepben/ewb/model/cim/iec61970/base/wires/load_break_switch.py index 4f7a6d760..57f2b8dce 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/load_break_switch.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/load_break_switch.py @@ -6,7 +6,7 @@ __all__ = ["LoadBreakSwitch"] from zepben.ewb.model.cim.iec61970.base.wires.protected_switch import ProtectedSwitch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_impedance.py b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_impedance.py index b1ceca26a..cb612afcd 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_impedance.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_impedance.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.wires.per_length_line_parameter import PerLengthLineParameter -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_line_parameter.py b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_line_parameter.py index 7a8821fb9..2acbdf96c 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_line_parameter.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_line_parameter.py @@ -8,7 +8,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_phase_impedance.py b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_phase_impedance.py index 838c5aa83..edb0557cb 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_phase_impedance.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_phase_impedance.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.phase_impedance_data import PhaseImpedanceData from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind from zepben.ewb.util import require, ngen, nlen, safe_remove, none -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_sequence_impedance.py b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_sequence_impedance.py index d940ba5fd..7c23e1293 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_sequence_impedance.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/per_length_sequence_impedance.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.per_length_impedance import PerLengthImpedance -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/petersen_coil.py b/src/zepben/ewb/model/cim/iec61970/base/wires/petersen_coil.py index c0fb12c4d..b435ba397 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/petersen_coil.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/petersen_coil.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.earth_fault_compensator import EarthFaultCompensator -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection.py b/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection.py index 0bd33000b..7d680df12 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection.py @@ -9,7 +9,7 @@ from typing import Optional, List, Generator, TYPE_CHECKING -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.iec61970.base.wires.regulating_cond_eq import RegulatingCondEq from zepben.ewb.util import ngen, nlen, get_by_mrid, safe_remove, require diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection_phase.py b/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection_phase.py index 3e3ab216b..3345c6914 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection_phase.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/power_electronics_connection_phase.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.power_electronics_connection import PowerElectronicsConnection diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer.py b/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer.py index 1226c6bcb..fc67591d6 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer.py @@ -14,7 +14,7 @@ else: from typing_extensions import deprecated -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.extensions.iec61970.base.wires.vector_group import VectorGroup from zepben.ewb.model.cim.iec61968.infiec61968.infassetinfo.transformer_construction_kind import TransformerConstructionKind from zepben.ewb.model.cim.iec61968.infiec61968.infassetinfo.transformer_function_kind import TransformerFunctionKind diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer_end.py b/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer_end.py index 4fa6b2a23..aa503e247 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer_end.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/power_transformer_end.py @@ -16,7 +16,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.winding_connection import WindingConnection from zepben.ewb.model.resistance_reactance import ResistanceReactance from zepben.ewb.util import ngen, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.power_transformer import PowerTransformer diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/protected_switch.py b/src/zepben/ewb/model/cim/iec61970/base/wires/protected_switch.py index 48510103f..9f3eee533 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/protected_switch.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/protected_switch.py @@ -12,7 +12,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.switch import Switch from zepben.ewb.util import get_by_mrid, ngen, nlen, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.protection.protection_relay_function import ProtectionRelayFunction diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py index e7293ecb3..20f47620f 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py @@ -10,7 +10,7 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.wires.tap_changer import TapChanger -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.transformer_end import TransformerEnd diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/reactive_capability_curve.py b/src/zepben/ewb/model/cim/iec61970/base/wires/reactive_capability_curve.py index a955cbd73..871c84fc4 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/reactive_capability_curve.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/reactive_capability_curve.py @@ -6,7 +6,7 @@ __all__ = ["ReactiveCapabilityCurve"] from zepben.ewb.model.cim.iec61970.base.core.curve import Curve -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/recloser.py b/src/zepben/ewb/model/cim/iec61970/base/wires/recloser.py index b6a16c5db..cb79229b0 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/recloser.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/recloser.py @@ -6,7 +6,7 @@ __all__ = ["Recloser"] from zepben.ewb.model.cim.iec61970.base.wires.protected_switch import ProtectedSwitch -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py index 4eaa8faf5..21095033d 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py @@ -11,7 +11,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.wires.energy_connection import EnergyConnection -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.regulating_control import RegulatingControl diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control.py b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control.py index 875e18fcc..ef87daaff 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/regulating_control.py @@ -14,7 +14,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.model.cim.iec61970.base.wires.regulating_control_mode_kind import RegulatingControlModeKind from zepben.ewb.util import nlen, get_by_mrid, safe_remove, ngen -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.terminal import Terminal diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/rotating_machine.py b/src/zepben/ewb/model/cim/iec61970/base/wires/rotating_machine.py index a930c2209..91a9def59 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/rotating_machine.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/rotating_machine.py @@ -9,7 +9,7 @@ from abc import ABCMeta from zepben.ewb.model.cim.iec61970.base.wires.regulating_cond_eq import RegulatingCondEq -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/series_compensator.py b/src/zepben/ewb/model/cim/iec61970/base/wires/series_compensator.py index 17dae934f..051610c23 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/series_compensator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/series_compensator.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/shunt_compensator.py b/src/zepben/ewb/model/cim/iec61970/base/wires/shunt_compensator.py index 7e8a542b9..504ead31f 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/shunt_compensator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/shunt_compensator.py @@ -15,7 +15,7 @@ else: from typing_extensions import deprecated -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.iec61970.base.core.phase_code import PhaseCode from zepben.ewb.model.cim.iec61970.base.wires.phase_shunt_connection_kind import PhaseShuntConnectionKind from zepben.ewb.model.cim.iec61970.base.wires.regulating_cond_eq import RegulatingCondEq diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/static_var_compensator.py b/src/zepben/ewb/model/cim/iec61970/base/wires/static_var_compensator.py index 35751a8af..0dfa736bb 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/static_var_compensator.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/static_var_compensator.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.regulating_cond_eq import RegulatingCondEq from zepben.ewb.model.cim.iec61970.base.wires.svc_control_mode import SVCControlMode -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/switch.py b/src/zepben/ewb/model/cim/iec61970/base/wires/switch.py index 9f948b7f9..e03d5ab54 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/switch.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/switch.py @@ -11,7 +11,7 @@ from typing import Optional, TYPE_CHECKING from abc import ABCMeta -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if sys.version_info >= (3, 13): from warnings import deprecated else: diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine.py b/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine.py index a2970cb74..0082bce55 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/synchronous_machine.py @@ -10,7 +10,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.rotating_machine import RotatingMachine from zepben.ewb.model.cim.iec61970.base.wires.synchronous_machine_kind import SynchronousMachineKind from zepben.ewb.util import ngen, nlen, get_by_mrid, safe_remove -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.reactive_capability_curve import ReactiveCapabilityCurve diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer.py b/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer.py index 619c14522..42f7de330 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer.py @@ -10,7 +10,7 @@ from zepben.ewb.model.cim.iec61970.base.core.power_system_resource import PowerSystemResource from zepben.ewb.util import require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.wires.tap_changer_control import TapChangerControl diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer_control.py b/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer_control.py index c32a35081..692a06292 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer_control.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/tap_changer_control.py @@ -8,7 +8,7 @@ from typing import Optional from zepben.ewb.model.cim.iec61970.base.wires.regulating_control import RegulatingControl -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass @zb_dataclass diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_end.py b/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_end.py index b6ea34497..1efccef84 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_end.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_end.py @@ -10,7 +10,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.util import require -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61970.base.core.base_voltage import BaseVoltage diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_star_impedance.py b/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_star_impedance.py index 5f097aeac..b786f1b67 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_star_impedance.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/transformer_star_impedance.py @@ -9,7 +9,7 @@ from zepben.ewb.model.cim.iec61970.base.core.identified_object import IdentifiedObject from zepben.ewb.model.resistance_reactance import ResistanceReactance -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.iec61968.assetinfo.transformer_end_info import TransformerEndInfo diff --git a/src/zepben/ewb/model/cim/iec61970/infiec61970/feeder/circuit.py b/src/zepben/ewb/model/cim/iec61970/infiec61970/feeder/circuit.py index 26d713af6..b36289d3a 100644 --- a/src/zepben/ewb/model/cim/iec61970/infiec61970/feeder/circuit.py +++ b/src/zepben/ewb/model/cim/iec61970/infiec61970/feeder/circuit.py @@ -11,7 +11,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.line import Line from zepben.ewb.util import ngen, get_by_mrid, safe_remove, nlen -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb.model.cim.extensions.iec61970.base.feeder.loop import Loop diff --git a/src/zepben/ewb/services/network/tracing/connectivity/connectivity_result.py b/src/zepben/ewb/services/network/tracing/connectivity/connectivity_result.py index 410b507ae..6245145f4 100644 --- a/src/zepben/ewb/services/network/tracing/connectivity/connectivity_result.py +++ b/src/zepben/ewb/services/network/tracing/connectivity/connectivity_result.py @@ -13,7 +13,7 @@ from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment from zepben.ewb.model.cim.iec61970.base.core.terminal import Terminal from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass if TYPE_CHECKING: from zepben.ewb import NominalPhasePath diff --git a/src/zepben/ewb/streaming/grpc/grpc.py b/src/zepben/ewb/streaming/grpc/grpc.py index 66c22058a..6c63c4b76 100644 --- a/src/zepben/ewb/streaming/grpc/grpc.py +++ b/src/zepben/ewb/streaming/grpc/grpc.py @@ -10,7 +10,7 @@ from typing import TypeVar, Generic, Callable, List, Union, Coroutine, Any from dataclasses import dataclass, field -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass T = TypeVar("T") diff --git a/test/dataclass_descriptors/test_basic_descriptor.py b/test/dataclass_descriptors/test_basic_descriptor.py index 701393446..121a04dec 100644 --- a/test/dataclass_descriptors/test_basic_descriptor.py +++ b/test/dataclass_descriptors/test_basic_descriptor.py @@ -4,8 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from dataclasses import field -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass, DataclassBase -from zepben.ewb.dataclass_descriptors.descriptor_fix import remove_descriptor_annotations, BackedDescriptor +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass, DataclassBase +from zepben.ewb.boilerplate.backed_descriptor import remove_descriptor_annotations, BackedDescriptor @zb_dataclass diff --git a/test/dataclass_descriptors/test_dataclass_base.py b/test/dataclass_descriptors/test_dataclass_base.py index 2db4ff624..c6ae10269 100644 --- a/test/dataclass_descriptors/test_dataclass_base.py +++ b/test/dataclass_descriptors/test_dataclass_base.py @@ -8,8 +8,8 @@ import pytest from zepben.ewb import Cut -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass, DataclassBase -from zepben.ewb.dataclass_descriptors.descriptor_fix import remove_descriptor_annotations +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass, DataclassBase +from zepben.ewb.boilerplate.backed_descriptor import remove_descriptor_annotations @zb_dataclass diff --git a/test/services/network/tracing/networktrace/test_network_trace_step_path_provider.py b/test/services/network/tracing/networktrace/test_network_trace_step_path_provider.py index 128f2c957..726cba3cc 100644 --- a/test/services/network/tracing/networktrace/test_network_trace_step_path_provider.py +++ b/test/services/network/tracing/networktrace/test_network_trace_step_path_provider.py @@ -8,7 +8,7 @@ from services.network.test_data.cuts_and_clamps_network import CutsAndClampsNetwork from zepben.ewb import NetworkStateOperators, TestNetworkBuilder, NetworkTraceStep, Terminal, NominalPhasePath, Breaker, AcLineSegment, Clamp, Cut -from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass +from zepben.ewb.boilerplate.dataclass_base import zb_dataclass from zepben.ewb.model.cim.iec61970.base.core.phase_code import PhaseCode from zepben.ewb.model.cim.iec61970.base.wires.single_phase_kind import SinglePhaseKind from zepben.ewb.services.network.network_service import NetworkService