greatly improved from implementing the "logging endgame" notebook

motion.py

@@ -1,14 +1,16 @@
-from logging import Logger
+import logging
 import re
 from datetime import timedelta
-from typing import Literal, Optional
+from logging import Logger
+from typing import TYPE_CHECKING, Literal, Optional
 
 from appdaemon.entity import Entity
 from appdaemon.plugins.hass.hassapi import Hass
 from console import setup_component_logging
 from pydantic import BaseModel, TypeAdapter
 
-from room_control import RoomController
+if TYPE_CHECKING:
+    from room_control import RoomController
 
 
 class CallbackEntry(BaseModel):
@@ -27,6 +29,7 @@ Callbacks = dict[str, dict[str, CallbackEntry]]
 
 class Motion(Hass):
     logger: Logger
+    app: 'RoomController'
 
     @property
     def sensor(self) -> Entity:
@@ -44,9 +47,13 @@ class Motion(Hass):
     def ref_entity_state(self) -> bool:
         return self.ref_entity.get_state() == 'on'
 
+    @property
+    def state_mismatch(self) -> bool:
+        return self.sensor_state != self.ref_entity_state
+
     def initialize(self):
         self.logger = setup_component_logging(self)
-        self.app: RoomController = self.get_app(self.args['app'])
+        self.app: 'RoomController' = self.get_app(self.args['app'])
         self.log(f'Connected to AD app [room]{self.app.name}[/]', level='DEBUG')
 
         assert self.entity_exists(self.args['sensor'])
@@ -57,7 +64,7 @@ class Motion(Hass):
             immediate=True,  # avoids needing to sync the state
         )
 
-        if self.sensor_state != self.ref_entity_state:
+        if self.state_mismatch:
             self.log(
                 f'Sensor is {self.sensor_state} ' f'and light is {self.ref_entity_state}',
                 level='WARNING',
@@ -75,15 +82,12 @@ class Motion(Hass):
 
         if callbacks := self.callbacks():
             for handle, entry in callbacks.items():
-                self.log(f'Handle [yellow]{handle[:4]}[/]: {entry.function}')
+                self.log(f'Handle [yellow]{handle[:4]}[/]: {entry.function}', level='DEBUG')
 
     def callbacks(self):
+        """Returns a dictionary of validated CallbackEntry objects that are associated with this app"""
         data = TypeAdapter(Callbacks).validate_python(self.get_callback_entries())
-        name: str = self.name
-        try:
-            return data[name]
-        except KeyError:
-            return []
+        return data.get(self.name, {})
 
     def listen_motion_on(self):
         """Sets up the motion on callback to activate the room"""
@@ -95,10 +99,10 @@ class Motion(Hass):
             oneshot=True,
             cause='motion on',
         )
-        self.log(f'Waiting for motion on [friendly_name]{self.sensor.friendly_name}[/]')
+        self.log(f'Waiting for sensor motion on [friendly_name]{self.sensor.friendly_name}[/]')
         if self.sensor_state:
             self.log(
-                f'[friendly_name]{self.sensor.friendly_name}[/] is already on', level='WARNING'
+                f'Sensor [friendly_name]{self.sensor.friendly_name}[/] is already on', level='WARNING'
             )
 
     def listen_motion_off(self, duration: timedelta):
@@ -113,12 +117,13 @@ class Motion(Hass):
             cause='motion off',
         )
         self.log(
-            f'Waiting for [friendly_name]{self.sensor.friendly_name}[/] to be clear for {duration}'
+            f'Waiting for sensor [friendly_name]{self.sensor.friendly_name}[/] to be clear for {duration}'
         )
 
         if not self.sensor_state:
             self.log(
-                f'[friendly_name]{self.sensor.friendly_name}[/] is currently off', level='WARNING'
+                f'Sensor [friendly_name]{self.sensor.friendly_name}[/] is currently off',
+                level='WARNING',
             )
 
     def callback_light_on(self, entity=None, attribute=None, old=None, new=None, kwargs=None):