X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=base_presence.py;h=ad852f9f7ebce82d5a76c6d7f1436a78670489e7;hb=31c81f6539969a5eba864d3305f9fb7bf716a367;hp=f774dbce270dc0b9c13c409ca9019d3a8e921166;hpb=36fea7f15ed17150691b5b3ead75450e575229ef;p=python_utils.git

diff --git a/base_presence.py b/base_presence.py
index f774dbc..ad852f9 100755
--- a/base_presence.py
+++ b/base_presence.py
@@ -1,20 +1,19 @@
 #!/usr/bin/env python3
 
 import datetime
-from collections import defaultdict
 import logging
 import re
-from typing import Dict, List, Set
 import warnings
+from collections import defaultdict
+from typing import Dict, List, Optional, Set
 
 # Note: this module is fairly early loaded.  Be aware of dependencies.
 import argparse_utils
 import bootstrap
 import config
+import site_config
 from type.locations import Location
 from type.people import Person
-import site_config
-
 
 logger = logging.getLogger(__name__)
 
@@ -75,7 +74,7 @@ class PresenceDetection(object):
         ] = defaultdict(dict)
         self.names_by_mac: Dict[str, str] = {}
         self.dark_locations: Set[Location] = set()
-        self.last_update = None
+        self.last_update: Optional[datetime.datetime] = None
 
     def maybe_update(self) -> None:
         if self.last_update is None:
@@ -85,9 +84,7 @@ class PresenceDetection(object):
             delta = now - self.last_update
             if (
                 delta.total_seconds()
-                > config.config[
-                    'presence_tolerable_staleness_seconds'
-                ].total_seconds()
+                > config.config['presence_tolerable_staleness_seconds'].total_seconds()
             ):
                 logger.debug(
                     f"It's been {delta.total_seconds()}s since last update; refreshing now."
@@ -146,9 +143,7 @@ class PresenceDetection(object):
             warnings.warn(msg, stacklevel=2)
             self.dark_locations.add(Location.HOUSE)
 
-    def read_persisted_macs_file(
-        self, filename: str, location: Location
-    ) -> None:
+    def read_persisted_macs_file(self, filename: str, location: Location) -> None:
         if location is Location.UNKNOWN:
             return
         with open(filename, "r") as rf:
@@ -177,9 +172,9 @@ class PresenceDetection(object):
                 logger.exception(e)
                 continue
             mac = mac.strip()
-            (self.location_ts_by_mac[location])[
-                mac
-            ] = datetime.datetime.fromtimestamp(int(ts.strip()))
+            (self.location_ts_by_mac[location])[mac] = datetime.datetime.fromtimestamp(
+                int(ts.strip())
+            )
             ip_name = ip_name.strip()
             match = re.match(r"(\d+\.\d+\.\d+\.\d+) +\(([^\)]+)\)", ip_name)
             if match is not None:
@@ -192,9 +187,7 @@ class PresenceDetection(object):
     def is_anyone_in_location_now(self, location: Location) -> bool:
         self.maybe_update()
         if location in self.dark_locations:
-            raise Exception(
-                f"Can't see {location} right now; answer undefined."
-            )
+            raise Exception(f"Can't see {location} right now; answer undefined.")
         for person in Person:
             if person is not None:
                 loc = self.where_is_person_now(person)
@@ -207,7 +200,9 @@ class PresenceDetection(object):
     def where_is_person_now(self, name: Person) -> Location:
         self.maybe_update()
         if len(self.dark_locations) > 0:
-            msg = f"Can't see {self.dark_locations} right now; answer confidence impacted"
+            msg = (
+                f"Can't see {self.dark_locations} right now; answer confidence impacted"
+            )
             logger.warning(msg)
             warnings.warn(msg, stacklevel=2)
         logger.debug(f'Looking for {name}...')
@@ -227,15 +222,11 @@ class PresenceDetection(object):
             if mac not in self.names_by_mac:
                 continue
             mac_name = self.names_by_mac[mac]
-            logger.debug(
-                f'Looking for {name}... check for mac {mac} ({mac_name})'
-            )
+            logger.debug(f'Looking for {name}... check for mac {mac} ({mac_name})')
             for location in self.location_ts_by_mac:
                 if mac in self.location_ts_by_mac[location]:
                     ts = (self.location_ts_by_mac[location])[mac]
-                    logger.debug(
-                        f'Seen {mac} ({mac_name}) at {location} since {ts}'
-                    )
+                    logger.debug(f'Seen {mac} ({mac_name}) at {location} since {ts}')
                     tiebreaks[location] = ts
 
             (
@@ -246,9 +237,7 @@ class PresenceDetection(object):
             v = votes.get(most_recent_location, 0)
             votes[most_recent_location] = v + bonus
             logger.debug(f'{name}: {location} gets {bonus} votes.')
-            credit = int(
-                credit * 0.2
-            )  # Note: list most important devices first
+            credit = int(credit * 0.2)  # Note: list most important devices first
             if credit <= 0:
                 credit = 1
         if len(votes) > 0: