X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=waitable_presence.py;h=46d7cbe04898c18cd72019c32c4dd1e5545c322e;hb=43635064329197b2f9e822d15e7315ac59141207;hp=d54511ff362bc45ceaf5c95e15174523f0327be9;hpb=e6f32fdd9b373dfcd100c7accb41f57d83c2f0a1;p=python_utils.git

diff --git a/waitable_presence.py b/waitable_presence.py
index d54511f..46d7cbe 100644
--- a/waitable_presence.py
+++ b/waitable_presence.py
@@ -13,9 +13,9 @@ from typing import Optional, Tuple
 from overrides import overrides
 
 import base_presence
-from type.locations import Location
 import site_config
 import state_tracker
+from type.locations import Location
 
 logger = logging.getLogger(__name__)
 
@@ -41,15 +41,17 @@ class WaitablePresenceDetectorWithMemory(state_tracker.WaitableAutomaticStateTra
         self,
         override_update_interval_sec: float = 60.0,
         override_location: Location = site_config.get_location(),
+        injected_presence_detector: Optional[base_presence.PresenceDetection] = None,
     ) -> None:
         self.last_someone_is_home: Optional[bool] = None
         self.someone_is_home: Optional[bool] = None
         self.everyone_gone_since: Optional[datetime.datetime] = None
         self.someone_home_since: Optional[datetime.datetime] = None
         self.location = override_location
-        self.detector: base_presence.PresenceDetection = (
-            base_presence.PresenceDetection()
-        )
+        if injected_presence_detector is not None:
+            self.detector: base_presence.PresenceDetection = injected_presence_detector
+        else:
+            self.detector = base_presence.PresenceDetection()
         super().__init__(
             {
                 'poll_presence': override_update_interval_sec,
@@ -89,15 +91,17 @@ class WaitablePresenceDetectorWithMemory(state_tracker.WaitableAutomaticStateTra
             logger.debug('PresenceDetector is incomplete; trying to reinitialize...')
             self.detector = base_presence.PresenceDetection()
 
-    def is_someone_home(self) -> Tuple[bool, datetime.datetime]:
+    def is_someone_home(self) -> Optional[Tuple[bool, datetime.datetime]]:
         """Returns a tuple of a bool that indicates whether someone is home
         and a datetime that indicates how long either someone has been
         home or no one has been home.
 
         """
         if self.someone_is_home is None:
-            raise Exception("Too Soon!")
+            return None  # checked too soon, wait a bit.
         if self.someone_is_home:
+            assert self.someone_home_since is not None
             return (True, self.someone_home_since)
         else:
+            assert self.everyone_gone_since is not None
             return (False, self.everyone_gone_since)