projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup.
[python_utils.git]
/
base_presence.py
diff --git
a/base_presence.py
b/base_presence.py
index f846e65bc921529229fd76b0784ad5450896b5e3..f18b870daceaa4e97cf47d5c7b68f90da1a2ed24 100755
(executable)
--- a/
base_presence.py
+++ b/
base_presence.py
@@
-1,20
+1,19
@@
#!/usr/bin/env python3
import datetime
#!/usr/bin/env python3
import datetime
-from collections import defaultdict
import logging
import re
import logging
import re
-from typing import Dict, List, Set
import warnings
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
# 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
from type.locations import Location
from type.people import Person
-import site_config
-
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-68,14
+67,12
@@
class PresenceDetection(object):
],
}
self.run_location = site_config.get_location()
],
}
self.run_location = site_config.get_location()
- logger.debug(
f"run_location is {self.run_location}"
)
+ logger.debug(
"base_presence run_location is %s", self.run_location
)
self.weird_mac_at_cabin = False
self.weird_mac_at_cabin = False
- self.location_ts_by_mac: Dict[
- Location, Dict[str, datetime.datetime]
- ] = defaultdict(dict)
+ self.location_ts_by_mac: Dict[Location, Dict[str, datetime.datetime]] = defaultdict(dict)
self.names_by_mac: Dict[str, str] = {}
self.dark_locations: Set[Location] = set()
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:
def maybe_update(self) -> None:
if self.last_update is None:
@@
-88,7
+85,7
@@
class PresenceDetection(object):
> config.config['presence_tolerable_staleness_seconds'].total_seconds()
):
logger.debug(
> config.config['presence_tolerable_staleness_seconds'].total_seconds()
):
logger.debug(
- f"It's been {delta.total_seconds()}s since last update; refreshing now."
+ "It's been %ss since last update; refreshing now.", delta.total_seconds()
)
self.update()
)
self.update()
@@
-160,17
+157,17
@@
class PresenceDetection(object):
line = line.strip()
if len(line) == 0:
continue
line = line.strip()
if len(line) == 0:
continue
- logger.debug(
f'{location}> {line}'
)
+ logger.debug(
'%s> %s', location, line
)
if "cabin_" in line:
continue
if location == Location.CABIN:
if "cabin_" in line:
continue
if location == Location.CABIN:
- logger.debug(
f'Cabin count: {cabin_count}'
)
+ logger.debug(
'Cabin count: %d', cabin_count
)
cabin_count += 1
try:
cabin_count += 1
try:
- (mac,
count, ip_name, mfg, ts) = line.split(",")
+ (mac,
_, ip_name, _, ts) = line.split(",") # type: ignore
except Exception as e:
except Exception as e:
- logger.error(f'SKIPPED BAD LINE> {line}')
logger.exception(e)
logger.exception(e)
+ logger.error('SKIPPED BAD LINE> %s', line)
continue
mac = mac.strip()
(self.location_ts_by_mac[location])[mac] = datetime.datetime.fromtimestamp(
continue
mac = mac.strip()
(self.location_ts_by_mac[location])[mac] = datetime.datetime.fromtimestamp(
@@
-201,12
+198,10
@@
class PresenceDetection(object):
def where_is_person_now(self, name: Person) -> Location:
self.maybe_update()
if len(self.dark_locations) > 0:
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.warning(msg)
warnings.warn(msg, stacklevel=2)
- logger.debug(
f'Looking for {name}...'
)
+ logger.debug(
'Looking for %s...', name
)
if name is Person.UNKNOWN:
if self.weird_mac_at_cabin:
if name is Person.UNKNOWN:
if self.weird_mac_at_cabin:
@@
-219,30
+214,39
@@
class PresenceDetection(object):
votes: Dict[Location, int] = {}
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
votes: Dict[Location, int] = {}
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
+ location = None
for mac in self.devices_by_person[name]:
if mac not in self.names_by_mac:
continue
mac_name = self.names_by_mac[mac]
for mac in self.devices_by_person[name]:
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(
+ 'Looking for %s... check for mac %s (%s)',
+ name, 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]
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(
+ 'Seen %s (%s) at %s since %s',
+ mac, mac_name, location, ts
+ )
tiebreaks[location] = ts
tiebreaks[location] = ts
- (most_recent_location, first_seen_ts) = dict_utils.item_with_max_value(
- tiebreaks
- )
+ (
+ most_recent_location,
+ _,
+ ) = dict_utils.item_with_max_value(tiebreaks)
bonus = credit
v = votes.get(most_recent_location, 0)
votes[most_recent_location] = v + bonus
bonus = credit
v = votes.get(most_recent_location, 0)
votes[most_recent_location] = v + bonus
- logger.debug(
f'{name}: {location} gets {bonus} votes.'
)
+ logger.debug(
'%s: %s gets %d votes.', name, most_recent_location, bonus
)
credit = int(credit * 0.2) # Note: list most important devices first
if credit <= 0:
credit = 1
if len(votes) > 0:
(location, value) = dict_utils.item_with_max_value(votes)
if value > 2001:
credit = int(credit * 0.2) # Note: list most important devices first
if credit <= 0:
credit = 1
if len(votes) > 0:
(location, value) = dict_utils.item_with_max_value(votes)
if value > 2001:
+ assert location
return location
return Location.UNKNOWN
return location
return Location.UNKNOWN