zepben.ewb 1.0.0b8__py3-none-any.whl → 1.0.0b9__py3-none-any.whl

zepben/ewb/services/network/tracing/networktrace/network_trace.py

@@ -413,9 +413,7 @@ class NetworkTrace(Traversal[NetworkTraceStep[T], 'NetworkTrace[T]'], Generic[T]
         return self._tracker.visit(terminal, phases)
 
 
-def default_condition_step_type(step_type: CanActionItem):
-    if step_type is None:
-        return False
+def default_condition_step_type(step_type: CanActionItem) -> NetworkTraceStep.Type:
     if step_type == NetworkTraceActionType.ALL_STEPS:
         return NetworkTraceStep.Type.ALL
     elif step_type == NetworkTraceActionType.FIRST_STEP_ON_EQUIPMENT:
@@ -432,19 +430,4 @@ def compute_data_with_action_type(compute_data: ComputeData[T], action_type: Can
                 current_step.data if next_path.traced_internally else compute_data.compute_next(current_step, current_context, next_path)
             )
         )
-    raise Exception(f'{action_type.__class__}: step doesnt match expected types')
-
-
-def with_paths_with_action_type(self, action_type: NetworkTraceActionType) -> ComputeDataWithPaths[T]:
-    if action_type == NetworkTraceActionType.ALL_STEPS:
-        return self
-    elif action_type == NetworkTraceActionType.FIRST_STEP_ON_EQUIPMENT:
-        return ComputeDataWithPaths(
-            lambda current_step, current_context, next_path, next_paths: (
-                current_step.data if next_path.traced_internally else self.compute_next(current_step, current_context, next_path, next_paths)
-            )
-        )
-    raise Exception('step doesnt match expected types')
-
-
-ComputeDataWithPaths[T].with_action_type = with_paths_with_action_type
+    raise Exception(f'{action_type.__name__}: step doesnt match expected types')

zepben/ewb/services/network/tracing/networktrace/network_trace_action_type.py

@@ -2,14 +2,14 @@
 #  This Source Code Form is subject to the terms of the Mozilla Public
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-from typing import Callable, Set, Any
+from typing import Callable, FrozenSet, Any
 from enum import Enum
 
 from zepben.ewb import Terminal, SinglePhaseKind
 from zepben.ewb.services.network.tracing.networktrace.network_trace_step import NetworkTraceStep
 from zepben.ewb.services.network.tracing.traversal.step_context import StepContext
 
-HasTracked = Callable[[Terminal, Set[SinglePhaseKind]], bool]
+HasTracked = Callable[[Terminal, FrozenSet[SinglePhaseKind]], bool]
 CanActionItem = Callable[[NetworkTraceStep[Any], StepContext, HasTracked], bool]
 
 

zepben/ewb/services/network/tracing/networktrace/network_trace_step.py

@@ -95,7 +95,10 @@ class NetworkTraceStep(Generic[T]):
         def next_num_equipment_steps(self, current_num: int) -> int:
             return current_num + 1 if self.traced_externally else current_num
 
-    Type = Enum('Type', ('ALL', 'INTERNAL', 'EXTERNAL'))
+    class Type(Enum):
+        ALL = 'ALL'
+        INTERNAL = 'INTERNAL'
+        EXTERNAL = 'EXTERNAL'
 
     def __init__(self, path: Path, num_terminal_steps: int, num_equipment_steps: int, data: T):
         self.path = path

{zepben_ewb-1.0.0b8.dist-info → zepben_ewb-1.0.0b9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zepben.ewb
-Version: 1.0.0b8
+Version: 1.0.0b9
 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.0.0b8.dist-info → zepben_ewb-1.0.0b9.dist-info}/RECORD

@@ -562,10 +562,10 @@ zepben/ewb/services/network/tracing/feeder/feeder_direction.py,sha256=Xdwneh6Gyj
 zepben/ewb/services/network/tracing/feeder/set_direction.py,sha256=C83E2-9m--zSL4X1KAH6ObLG5N-nGtUN1ZQEV2zcuss,7233
 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=oiEVcfMF9DNgSEUQ1tKvxDR7c-S3rk-zALms45ANB1k,23141
-zepben/ewb/services/network/tracing/networktrace/network_trace_action_type.py,sha256=OCq_NrfaPsdLwac_mz_0LvY5rpr5jVQMqtw4RUEM69k,1844
+zepben/ewb/services/network/tracing/networktrace/network_trace.py,sha256=VZVakaEsbiwsSPmwiKncojSl3E7-7UMPTiTxjfIfvZQ,22458
+zepben/ewb/services/network/tracing/networktrace/network_trace_action_type.py,sha256=VBmt3Qm4TZV_3Cmgp_M26nZlNz1AZZ0dF9-u86AEmuw,1856
 zepben/ewb/services/network/tracing/networktrace/network_trace_queue_next.py,sha256=XK4JMOw8x9NPWuA0CZwnWnefDQ0Jvz54RtHqoNDYBms,4410
-zepben/ewb/services/network/tracing/networktrace/network_trace_step.py,sha256=1q-sOV0dVbPAR0goRwSF3WLVYPNHgKUwlnppyYgjrYw,5919
+zepben/ewb/services/network/tracing/networktrace/network_trace_step.py,sha256=UhMk62LgWvQQtGbWmUQjDi7hj5NQrLFNvYfo2BEcIcc,5964
 zepben/ewb/services/network/tracing/networktrace/network_trace_step_path_provider.py,sha256=llDYE8UrmP96b5oc2-zk4qv2dx0SOl5RrVP3pX-rx78,17093
 zepben/ewb/services/network/tracing/networktrace/network_trace_tracker.py,sha256=EZAwZ9aSuKrykxKCHmNQHhDE-1LjvhwT-pGy6EScv0s,1521
 zepben/ewb/services/network/tracing/networktrace/tracing.py,sha256=gsgR_wWOqcZNGbHBYg7h8aqzi2BlSF6AqBPHIYxSN-I,6836
@@ -634,8 +634,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.0.0b8.dist-info/licenses/LICENSE,sha256=aAHD66h6PQIETpkJDvg5yEObyFvXUED8u7S8dlh6K0Y,16725
-zepben_ewb-1.0.0b8.dist-info/METADATA,sha256=qRyKHwO8p3JuW5aHqreKOWlsaIl1EfAAuxBark4wPp4,3300
-zepben_ewb-1.0.0b8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zepben_ewb-1.0.0b8.dist-info/top_level.txt,sha256=eVLDJiO6FGjL_Z7KdmFE-R8uf1Q07aaVLGe9Ee4kmBw,7
-zepben_ewb-1.0.0b8.dist-info/RECORD,,
+zepben_ewb-1.0.0b9.dist-info/licenses/LICENSE,sha256=aAHD66h6PQIETpkJDvg5yEObyFvXUED8u7S8dlh6K0Y,16725
+zepben_ewb-1.0.0b9.dist-info/METADATA,sha256=yMCVU-LTNqFidSkyWxmDOgVYYFnXNzamz2jvVCx-ieQ,3300
+zepben_ewb-1.0.0b9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zepben_ewb-1.0.0b9.dist-info/top_level.txt,sha256=eVLDJiO6FGjL_Z7KdmFE-R8uf1Q07aaVLGe9Ee4kmBw,7
+zepben_ewb-1.0.0b9.dist-info/RECORD,,