back to list to prevent having to change everything for now...

Author: r3w0p

bobocep/cep/engine/decider/decider.py

@@ -228,12 +228,12 @@ def update(self) -> bool:
                 rl_completed, rl_halted, rl_updated = \
                     self._process_event(self._queue.get_nowait())
 
-                completed: Tuple[BoboRunSerial, ...] = \
-                    tuple(run_c.serialize() for run_c in rl_completed)
-                halted: Tuple[BoboRunSerial, ...] = \
-                    tuple(run_h.serialize() for run_h in rl_halted)
-                updated: Tuple[BoboRunSerial, ...] = \
-                    tuple(run_u.serialize() for run_u in rl_updated)
+                completed: List[BoboRunSerial] = \
+                    [run_c.serialize() for run_c in rl_completed]
+                halted: List[BoboRunSerial] = \
+                    [run_h.serialize() for run_h in rl_halted]
+                updated: List[BoboRunSerial] = \
+                    [run_u.serialize() for run_u in rl_updated]
 
                 # Cache local changes
                 self._maybe_cache(completed, halted)
@@ -268,7 +268,11 @@ def snapshot(self) -> Tuple[
             if self._closed:
                 return [], [], []
 
-            if self._caching:
+            if (
+                    self._caching and
+                    self._cache_completed is not None and
+                    self._cache_halted is not None
+            ):
                 # Get completed from cache
                 r_completed = [c for c in self._cache_completed]
 
@@ -290,9 +294,9 @@ def snapshot(self) -> Tuple[
 
     def on_distributed_update(
             self,
-            completed: Tuple[BoboRunSerial, ...],
-            halted: Tuple[BoboRunSerial, ...],
-            updated: Tuple[BoboRunSerial, ...]) -> None:
+            completed: List[BoboRunSerial],
+            halted: List[BoboRunSerial],
+            updated: List[BoboRunSerial]) -> None:
         """
         :param completed: Completed runs.
         :param halted: Halted runs.
@@ -305,7 +309,10 @@ def on_distributed_update(
             remove_indices_completed = []
             remove_indices_halted = []
             remove_indices_updated = []
-            runlocal: Optional[BoboRun] = None  # here because of mypy...
+
+            # here because of mypy...
+            runlocal: Optional[BoboRun] = None
+            runs: Optional[List[BoboRun]] = None
 
             # Remove any invalid remote changes
             completed, halted, updated = \
@@ -335,7 +342,7 @@ def on_distributed_update(
 
                         continue
 
-                    runs: List[BoboRun] = self.runs_pattern(
+                    runs = self.runs_pattern(
                         runremote.phenomenon_name,
                         pattern.name
                     )
@@ -379,7 +386,7 @@ def on_distributed_update(
 
                 if pattern.singleton:
                     # If singleton, use active run if exists...
-                    runs: List[BoboRun] = self.runs_pattern(
+                    runs = self.runs_pattern(
                         runremote.phenomenon_name,
                         pattern.name
                     )
@@ -429,10 +436,6 @@ def on_distributed_update(
                     del remlist[i]
 
             # Notify subscribers
-            completed = tuple(completed)
-            halted = tuple(halted)
-            updated = tuple(updated)
-
             for subscriber in self._subscribers:
                 subscriber.on_decider_update(
                     completed=completed,
@@ -630,7 +633,11 @@ def _maybe_cache(
         :param completed: Completed runs.
         :param halted: Halted runs.
         """
-        if self._caching:
+        if (
+                self._caching and
+                self._cache_completed is not None and
+                self._cache_halted is not None
+        ):
             # Cache runs that have been locally completed
             for c in completed:
                 self._cache_completed.append(c)
@@ -641,9 +648,9 @@ def _maybe_cache(
 
     def _maybe_check_against_cache(
             self,
-            completed: Tuple[BoboRunSerial, ...],
-            halted: Tuple[BoboRunSerial, ...],
-            updated: Tuple[BoboRunSerial, ...]) \
+            completed: List[BoboRunSerial],
+            halted: List[BoboRunSerial],
+            updated: List[BoboRunSerial]) \
             -> Tuple[
                 List[BoboRunSerial],
                 List[BoboRunSerial],
@@ -661,7 +668,11 @@ def _maybe_check_against_cache(
             (2) halted runs kept if not halted locally; and
             (3) updated runs kept if not completed or halted locally.
         """
-        if self._caching:
+        if (
+                self._caching and
+                self._cache_completed is not None and
+                self._cache_halted is not None
+        ):
             # Keep completed IDs if not completed locally
             # Complete takes precedent over halt and update
             completed = [

bobocep/cep/engine/decider/pubsub.py

@@ -20,9 +20,9 @@ class BoboDeciderSubscriber(ABC):
     @abstractmethod
     def on_decider_update(
             self,
-            completed: Tuple[BoboRunSerial, ...],
-            halted: Tuple[BoboRunSerial, ...],
-            updated: Tuple[BoboRunSerial, ...],
+            completed: List[BoboRunSerial],
+            halted: List[BoboRunSerial],
+            updated: List[BoboRunSerial],
             local: bool
     ) -> None:
         """

bobocep/dist/devman.py

@@ -138,7 +138,9 @@ def clear_last(self) -> None:
             self._last_attempt = 0
 
     def stash(self) -> Tuple[
-        List[BoboRunSerial], List[BoboRunSerial], List[BoboRunSerial]
+        List[BoboRunSerial],
+        List[BoboRunSerial],
+        List[BoboRunSerial]
     ]:
         """
         :return: The device's stash.

bobocep/setup/simple.py

@@ -49,7 +49,7 @@ def __init__(
         super().__init__()
 
         self._phenomena: List[BoboPhenomenon] = phenomena
-        self._validator: BoboValidator = validator
+        self._validator: Optional[BoboValidator] = validator
         self._handler: BoboActionHandler = handler
         self._gen_event: Optional[BoboGenEvent] = gen_event
         self._urn: Optional[str] = urn