zepben.ewb 1.1.0b13__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

zepben/ewb/database/sqlite/network/network_database_reader.py

@@ -75,6 +75,21 @@ class NetworkDatabaseReader(BaseDatabaseReader):
     async def _post_load(self) -> bool:
         status = await super()._post_load()
 
+        #
+        # NOTE: We need to have the feeder head equipment assigned before we can set the feeder directions to prevent
+        #       tracing back into the zone substation in parallel feeders. Rather than splitting the feeder assignment
+        #       into two passes, we can just assign the equipment to feeders before we set the directions.
+        #
+        self._logger.info("Assigning equipment to feeders...")
+        await self.assign_to_feeders.run(self.service, network_state_operators=NetworkStateOperators.NORMAL)
+        await self.assign_to_feeders.run(self.service, network_state_operators=NetworkStateOperators.CURRENT)
+        self._logger.info("Equipment assigned to feeders.")
+
+        self._logger.info("Assigning equipment to LV feeders...")
+        await self.assign_to_lv_feeders.run(self.service, network_state_operators=NetworkStateOperators.NORMAL)
+        await self.assign_to_lv_feeders.run(self.service, network_state_operators=NetworkStateOperators.CURRENT)
+        self._logger.info("Equipment assigned to LV feeders.")
+
         self._logger.info("Applying feeder direction to network...")
         await self.set_feeder_direction.run(self.service, network_state_operators=NetworkStateOperators.NORMAL)
         await self.set_feeder_direction.run(self.service, network_state_operators=NetworkStateOperators.CURRENT)
@@ -91,16 +106,6 @@ class NetworkDatabaseReader(BaseDatabaseReader):
 
         self._logger.info("Phasing applied to network.")
 
-        self._logger.info("Assigning equipment to feeders...")
-        await self.assign_to_feeders.run(self.service, network_state_operators=NetworkStateOperators.NORMAL)
-        await self.assign_to_feeders.run(self.service, network_state_operators=NetworkStateOperators.CURRENT)
-        self._logger.info("Equipment assigned to feeders.")
-
-        self._logger.info("Assigning equipment to LV feeders...")
-        await self.assign_to_lv_feeders.run(self.service, network_state_operators=NetworkStateOperators.NORMAL)
-        await self.assign_to_lv_feeders.run(self.service, network_state_operators=NetworkStateOperators.CURRENT)
-        self._logger.info("Equipment assigned to LV feeders.")
-
         self._logger.info("Validating that each equipment is assigned to a container...")
         self._validate_equipment_containers()
         self._logger.info("Equipment containers validated.")

zepben/ewb/model/cim/iec61970/base/core/identified_object.py

@@ -14,7 +14,7 @@ from typing import Callable, Any, List, Generator, Optional, overload, TypeVar
 from zepben.ewb.dataclassy import dataclass
 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, CopyableUUID, nlen, ngen, safe_remove
+from zepben.ewb.util import require, nlen, ngen, safe_remove
 
 logger = logging.getLogger(__name__)
 
@@ -30,7 +30,7 @@ class IdentifiedObject(object, metaclass=ABCMeta):
     relation, however must be in snake case to keep the phases PEP compliant.
     """
 
-    mrid: str = CopyableUUID()
+    mrid: str
     """Master resource identifier issued by a model authority. The mRID is unique within an exchange context. 
     Global uniqueness is easily achieved by using a UUID, as specified in RFC 4122, for the mRID. The use of UUID is strongly recommended."""
 
@@ -46,6 +46,9 @@ class IdentifiedObject(object, metaclass=ABCMeta):
 
     def __init__(self, names: Optional[List[Name]] = None, **kwargs):
         super(IdentifiedObject, self).__init__(**kwargs)
+        if not self.mrid or not self.mrid.strip():
+            raise ValueError("You must provide an mRID for this object.")
+
         if names:
             for name in names:
                 self.add_name(name.type, name.name)

zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py

@@ -28,7 +28,8 @@ class RegulatingCondEq(EnergyConnection):
 
     def __init__(self, regulating_control: Optional[RegulatingControl] = None, **kwargs):
         super(RegulatingCondEq, self).__init__(**kwargs)
-        self.regulating_control = regulating_control
+        if regulating_control:
+            self.regulating_control = regulating_control
 
     @property
     def regulating_control(self):

zepben/ewb/services/common/translator/base_proto2cim.py

@@ -79,7 +79,7 @@ def document_to_cim(pb: PBDocument, cim: Document, service: BaseService):
 @bind_to_cim
 @add_to_network_or_none
 def organisation_to_cim(pb: PBOrganisation, service: BaseService) -> Optional[Organisation]:
-    cim = Organisation()
+    cim = Organisation(mrid=pb.mrid())
 
     identified_object_to_cim(pb.io, cim, service)
     return cim

zepben/ewb/services/network/network_extensions.py

@@ -18,7 +18,7 @@ from zepben.ewb.model.cim.iec61970.base.wires.junction import Junction
 from zepben.ewb.model.cim.iec61970.base.wires.power_transformer import PowerTransformer
 from zepben.ewb.model.cim.iec61970.base.wires.power_transformer_end import PowerTransformerEnd
 from zepben.ewb.services.network.network_service import NetworkService
-from zepben.ewb.util import CopyableUUID
+from zepben.ewb.util import generate_id
 
 
 # !! WARNING !! #
@@ -39,7 +39,7 @@ def create_two_winding_power_transformer(network_service: NetworkService, cn1: C
     _connect_two_terminal_conducting_equipment(network_service=network_service, ce=power_transformer, cn1=cn1, cn2=cn2)
     # TODO: How to associated PowerTransformerEndInfo to a PowerTransformerInfo
     for i in range(1, 2):
-        end = PowerTransformerEnd(power_transformer=power_transformer)
+        end = PowerTransformerEnd(f"{power_transformer.mrid}-pte{i}", power_transformer=power_transformer)
         power_transformer.add_end(end)
         end.terminal = power_transformer.get_terminal_by_sn(i)
     return power_transformer
@@ -69,7 +69,7 @@ def create_breaker(network_service: NetworkService, cn1: ConnectivityNode, cn2:
 def create_bus(network_service: NetworkService, **kwargs) -> Junction:
     bus = Junction(**kwargs)
     if 'mrid' not in kwargs:
-        bus.mrid = str(CopyableUUID())
+        bus.mrid = generate_id()
     network_service.add(bus)
     _create_terminals(ce=bus, network=network_service)
     # TODO: Figure out how to add Voltage to Buses - Looks like we need to add topologicalNode to support the
@@ -79,7 +79,7 @@ def create_bus(network_service: NetworkService, **kwargs) -> Junction:
 
 def _create_two_terminal_conducting_equipment(network_service: NetworkService, ce: ConductingEquipment, **kwargs):
     if 'mrid' not in kwargs:
-        ce.mrid = str(CopyableUUID())
+        ce.mrid = generate_id()
     network_service.add(ce)
     _create_terminals(ce=ce, num_terms=2, network=network_service)
 
@@ -92,7 +92,7 @@ def _connect_two_terminal_conducting_equipment(network_service: NetworkService,
 
 def _create_single_terminal_conducting_equipment(network_service: NetworkService, ce: ConductingEquipment, **kwargs):
     if 'mrid' not in kwargs:
-        ce.mrid = str(CopyableUUID())
+        ce.mrid = generate_id()
     network_service.add(ce)
     _create_terminals(ce=ce, network=network_service)
 

zepben/ewb/services/network/tracing/feeder/set_direction.py

@@ -33,6 +33,12 @@ class SetDirection:
     """
     Convenience class that provides methods for setting feeder direction on a [NetworkService]
     This class is backed by a [BranchRecursiveTraversal].
+
+    NOTE: The feeder head equipment must be assigned to its [Feeder] before this is run. If you don't,
+          the feeder direction will be assigned back through feeder heads when they are run in parallel.
+
+    :param debug_logger: An optional `Logger` that can be used to log debug messages on what the underlying trace is doing. This
+    should only ever be used in a debug cycle, and should always be `None` in production code.
     """
 
     def __init__(self, debug_logger: Logger = None):

zepben/ewb/util.py

@@ -15,7 +15,7 @@ __all__ = [
     "is_none_or_empty",
     "require",
     "pb_or_none",
-    "CopyableUUID",
+    "generate_id",
     "datetime_to_timestamp",
     "none",
     "classproperty",
@@ -170,14 +170,8 @@ def none(collection: Collection):
     raise ValueError("none() only supports collection types")
 
 
-class CopyableUUID(UUID):
-
-    def __init__(self):
-        super().__init__(bytes=os.urandom(16), version=4)
-
-    @staticmethod
-    def copy():
-        return str(UUID(bytes=os.urandom(16), version=4))
+def generate_id() -> str:
+    return str(UUID(bytes=os.urandom(16), version=4))
 
 
 class classproperty(property):

{zepben_ewb-1.1.0b13.dist-info → zepben_ewb-1.2.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zepben.ewb
-Version: 1.1.0b13
+Version: 1.2.0b1
 Summary: Python SDK for interacting with the Energy Workbench platform
 Author-email: Kurt Greaves <kurt.greaves@zepben.com>, Max Chesterfield <max.chesterfield@zepben.com>
 License-Expression: MPL-2.0

{zepben_ewb-1.1.0b13.dist-info → zepben_ewb-1.2.0b1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 zepben/ewb/__init__.py,sha256=nPkN55KJGBRGRk7fLZAFmzaxu9Z7RR7gGAAwFWdy3lY,40580
 zepben/ewb/exceptions.py,sha256=KLR6_5U-K4_VtKQZkKBlbOF7wlKnajQuhSiGeeNAo9U,1384
 zepben/ewb/types.py,sha256=067jjQX6eCbgaEtlQPdSBi_w4_16unbP1f_g5NrVj_w,627
-zepben/ewb/util.py,sha256=lgxqbGEQO8df-Bs88-4bVijB8CY9rY8ox8WjibqZWnM,5728
+zepben/ewb/util.py,sha256=JAa6epASTcxbu6gISzYJPjCGhckIugMd6tnVRMlSlMc,5605
 zepben/ewb/auth/__init__.py,sha256=DUsi8JWvKMQt4xEUCHbCVPjGkEfr2MRu2JIvobYTB-M,406
 zepben/ewb/auth/client/__init__.py,sha256=nFdcikJb3FegBko35m1xxmjMmC3cZCaqr8ohypQJQIQ,245
 zepben/ewb/auth/client/zepben_token_fetcher.py,sha256=q1-co2LSWPwuSzzUZmNLYmjsQaCIrfSu4tOxwS_TMMk,12201
@@ -56,7 +56,7 @@ zepben/ewb/database/sqlite/extensions/result_set.py,sha256=cVhO3kKoKq9WSXkB7cNBN
 zepben/ewb/database/sqlite/network/__init__.py,sha256=waADXEvfUG9wAN4STx5uIUHOv0UnpZLH2qU1LXgaDBc,243
 zepben/ewb/database/sqlite/network/network_cim_reader.py,sha256=OiueGdBKi4vxqVJJHPRpON8laPnREnqLIQ6_y6NixY4,211000
 zepben/ewb/database/sqlite/network/network_cim_writer.py,sha256=Vk2kvFU6tEARr0WUe4n75NfYBKkX0H4aqQN4v4bpQRE,159215
-zepben/ewb/database/sqlite/network/network_database_reader.py,sha256=o9y8L-V5G4JNSyqoB81p-qBkXSNr7Xrk5eXDRrwivuo,9141
+zepben/ewb/database/sqlite/network/network_database_reader.py,sha256=uw0J32nnfufm_9MgE5TxPZb5j_6YoeBzWtq-h1Lh2Fo,9505
 zepben/ewb/database/sqlite/network/network_database_tables.py,sha256=jNXIj2AbXs_KWlSpfeBtPPGW5BHbqh-GxKd9nxPr_u4,15753
 zepben/ewb/database/sqlite/network/network_database_writer.py,sha256=ANmNcK-9MZpyW6qWmq1htHyDNYroFf0OC_Wzd7I3NoA,1989
 zepben/ewb/database/sqlite/network/network_service_reader.py,sha256=eExu1jNOfhQb1zJfF13-mNR8ulX0Yw6j5ApYCu3b82s,24406
@@ -396,7 +396,7 @@ zepben/ewb/model/cim/iec61970/base/core/equipment.py,sha256=y5qhryMlYmcJfMQYc4wF
 zepben/ewb/model/cim/iec61970/base/core/equipment_container.py,sha256=1GjHcISjQlh9OqgIJ3Sy5VguQvoJ1Ts_lYCkdkVnLHQ,8116
 zepben/ewb/model/cim/iec61970/base/core/feeder.py,sha256=5gG8KopIsp1z9D3r9sCUc5y2I7oiTgJ7LF-DRhm2PT4,11368
 zepben/ewb/model/cim/iec61970/base/core/geographical_region.py,sha256=LsOfVHuWL32zjPvgylpqiTsP9uvOeREVKgvKYMgZOOQ,3852
-zepben/ewb/model/cim/iec61970/base/core/identified_object.py,sha256=n6cHj923enWYsbgcAT5IRBvmirc7M5e-MuwaIrvRPzc,9833
+zepben/ewb/model/cim/iec61970/base/core/identified_object.py,sha256=TwY7M6zpd-Wvb8LxyHAUFJq6-lkioUtSVqxh0P689Gc,9928
 zepben/ewb/model/cim/iec61970/base/core/name.py,sha256=Jgq664dfkYxVgYt4ThJM6g5NaJg40GW5ePZg4nVRC8Q,1285
 zepben/ewb/model/cim/iec61970/base/core/name_type.py,sha256=N-ZCjV_ihvq4iTVBSrVYuew4Uc9gtFSJq1qElcK9jmI,7888
 zepben/ewb/model/cim/iec61970/base/core/phase_code.py,sha256=8PWCBOSDniP_921sD8Qh30RVUTdWfWur0NvdeZLXlTI,7049
@@ -478,7 +478,7 @@ zepben/ewb/model/cim/iec61970/base/wires/protected_switch.py,sha256=yMn2MMvbViXL
 zepben/ewb/model/cim/iec61970/base/wires/ratio_tap_changer.py,sha256=iYrZd8rjFfuPC-wGuYFKfNRBuHuA2Ss9ad_Gnt7qj_o,1161
 zepben/ewb/model/cim/iec61970/base/wires/reactive_capability_curve.py,sha256=RvnW7HjAxsl3DNM9ABgzBqaoOSnbPBVwdvoIWwCMMj8,824
 zepben/ewb/model/cim/iec61970/base/wires/recloser.py,sha256=UmL-qht9TL_VDZMUdWQ_4HeCG6dZLl_1G1ggro802VY,541
-zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py,sha256=khnRHTXAsosUvcQsXN7cv3vWzP_OYsLXUeKuvHkG6Ow,1792
+zepben/ewb/model/cim/iec61970/base/wires/regulating_cond_eq.py,sha256=ead_d22h_GieSz2soOfBhaUq_B1q3zie1lKVK9uQs_s,1827
 zepben/ewb/model/cim/iec61970/base/wires/regulating_control.py,sha256=tyYfQHj_Fo4WJyyOglkvxg5D_D4zeB1kniH3EvcmHsk,9343
 zepben/ewb/model/cim/iec61970/base/wires/regulating_control_mode_kind.py,sha256=qzxns3WLPo_bICQgctvPuz_667RB2gG0s51i7JXKH98,1203
 zepben/ewb/model/cim/iec61970/base/wires/rotating_machine.py,sha256=pn8V5O5TPIhmWWX1hri27INs_iOEvQePukvjEN4A8HY,1513
@@ -514,7 +514,7 @@ zepben/ewb/services/common/meta/metadata_translations.py,sha256=O8tW3YVrogmKEAOE
 zepben/ewb/services/common/meta/service_info.py,sha256=EX1iwDv6ENS4la-hs9XQXjfKv10bM-P_WYx48xW42ik,609
 zepben/ewb/services/common/translator/__init__.py,sha256=waADXEvfUG9wAN4STx5uIUHOv0UnpZLH2qU1LXgaDBc,243
 zepben/ewb/services/common/translator/base_cim2proto.py,sha256=OxlXiFiZGxdinqBgbmHSOEnOZNKhJgmvg_jswDSgKkw,3860
-zepben/ewb/services/common/translator/base_proto2cim.py,sha256=wRdnwFD0GeWy_rrJ3v76dGYevkJ78UeMNbTGXRhFE9g,5203
+zepben/ewb/services/common/translator/base_proto2cim.py,sha256=afGTsUnax3fvZTfAm014OM5dZiIlZwxLJxxGxgU02_Q,5217
 zepben/ewb/services/common/translator/service_differences.py,sha256=ZFbGFMxTTnT4zt4zIt2BK_ikg_71vGkkmH8JhII2bMc,2913
 zepben/ewb/services/common/translator/util.py,sha256=C7KGB5B7I3j2uSlDLtKUeQUNSFqLCqz4u9vA-TKKE34,2292
 zepben/ewb/services/customer/__init__.py,sha256=waADXEvfUG9wAN4STx5uIUHOv0UnpZLH2qU1LXgaDBc,243
@@ -537,7 +537,7 @@ zepben/ewb/services/measurement/translator/__init__.py,sha256=IoQHJ-CYDhqiYL6WKK
 zepben/ewb/services/measurement/translator/measurement_cim2proto.py,sha256=syPJC3FtXyNrJNRDc4oCLZUL0kzgyXRI7CsRmrbznhI,2114
 zepben/ewb/services/measurement/translator/measurement_proto2cim.py,sha256=fsRXt_txPzUWDrFreZ1C1LcizUZQ-qlFq2aGADo9Q_E,2326
 zepben/ewb/services/network/__init__.py,sha256=waADXEvfUG9wAN4STx5uIUHOv0UnpZLH2qU1LXgaDBc,243
-zepben/ewb/services/network/network_extensions.py,sha256=8vbY0wkgTx-CosTzuENc2iGjJQaCxb6xEgjrDqLkZ5c,6110
+zepben/ewb/services/network/network_extensions.py,sha256=PGkeW2z5WNpQ8MeQIfCpTUL7ukne2uHO9R-PlBKEWyg,6127
 zepben/ewb/services/network/network_service.py,sha256=tfmafoAK36bv_aMPL0zCagd3-RjUwGJX1MUeF5xZup4,12574
 zepben/ewb/services/network/network_service_comparator.py,sha256=sxbseccB4l_K399rJVJxnmaOT6m4QGKlNbdTtBGbBfs,61978
 zepben/ewb/services/network/network_state.py,sha256=PQo1xm6p4WGHzLtd4zy3nYMJ6miR3ypj7hSQx_dRgXY,837
@@ -560,7 +560,7 @@ zepben/ewb/services/network/tracing/feeder/assign_to_lv_feeders.py,sha256=2j4GlY
 zepben/ewb/services/network/tracing/feeder/clear_direction.py,sha256=ApbypMhaX0zDmHKwkcOID9viYr9b6Tj0rCX9Q4W0BT0,4142
 zepben/ewb/services/network/tracing/feeder/direction_status.py,sha256=2QRys_WFtazvFOJZ-5XU0ORD55T-O9wAxd93OI3Hc3w,3982
 zepben/ewb/services/network/tracing/feeder/feeder_direction.py,sha256=Xdwneh6Gyjhj711P86kETPzs3fXzQB0DwUoe8vZQMpg,3534
-zepben/ewb/services/network/tracing/feeder/set_direction.py,sha256=C83E2-9m--zSL4X1KAH6ObLG5N-nGtUN1ZQEV2zcuss,7233
+zepben/ewb/services/network/tracing/feeder/set_direction.py,sha256=VXSUxkxJpLgO0_m5XF8WRbMsVwMRW9vqklCcphnStP4,7667
 zepben/ewb/services/network/tracing/networktrace/__init__.py,sha256=8-znO960twGtcAGArLGl_ijbCB9BBv0_hUNYf1eF0Lk,243
 zepben/ewb/services/network/tracing/networktrace/compute_data.py,sha256=u26vBTK-X0ePibK-z2faB2PABj9AMCj5igNmcquNPrs,2661
 zepben/ewb/services/network/tracing/networktrace/network_trace.py,sha256=VZVakaEsbiwsSPmwiKncojSl3E7-7UMPTiTxjfIfvZQ,22458
@@ -635,8 +635,8 @@ zepben/ewb/streaming/mutations/update_network_state_client.py,sha256=e0Oma5PRT8m
 zepben/ewb/streaming/mutations/update_network_state_service.py,sha256=irR-TO67QXRyBmK8PU8SzM31NKSSefZt_nQGHi5IhT8,3260
 zepben/ewb/testing/__init__.py,sha256=waADXEvfUG9wAN4STx5uIUHOv0UnpZLH2qU1LXgaDBc,243
 zepben/ewb/testing/test_network_builder.py,sha256=KG0o2ZHUswx3xClu-JnLs_pYIYbQ5jjtvtyZ7LI6IZ8,38092
-zepben_ewb-1.1.0b13.dist-info/licenses/LICENSE,sha256=aAHD66h6PQIETpkJDvg5yEObyFvXUED8u7S8dlh6K0Y,16725
-zepben_ewb-1.1.0b13.dist-info/METADATA,sha256=g-_xKV3CMNKYgXs8toF8qg-sRp3SpdbEIMQaRf10R_I,3233
-zepben_ewb-1.1.0b13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zepben_ewb-1.1.0b13.dist-info/top_level.txt,sha256=eVLDJiO6FGjL_Z7KdmFE-R8uf1Q07aaVLGe9Ee4kmBw,7
-zepben_ewb-1.1.0b13.dist-info/RECORD,,
+zepben_ewb-1.2.0b1.dist-info/licenses/LICENSE,sha256=aAHD66h6PQIETpkJDvg5yEObyFvXUED8u7S8dlh6K0Y,16725
+zepben_ewb-1.2.0b1.dist-info/METADATA,sha256=LZdlYfujRNUpTubhHrFE49M4h6tgFcgyhxvGzD-BCvI,3232
+zepben_ewb-1.2.0b1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+zepben_ewb-1.2.0b1.dist-info/top_level.txt,sha256=eVLDJiO6FGjL_Z7KdmFE-R8uf1Q07aaVLGe9Ee4kmBw,7
+zepben_ewb-1.2.0b1.dist-info/RECORD,,

{zepben_ewb-1.1.0b13.dist-info → zepben_ewb-1.2.0b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any