diff --git a/src/room_control/door.py b/src/room_control/door.py index 208ba42..6b15f81 100644 --- a/src/room_control/door.py +++ b/src/room_control/door.py @@ -15,9 +15,7 @@ class Door(Hass): async def initialize(self): self.app: 'RoomController' = await self.get_app(self.args['app']) - self.logger = console.load_rich_config( - room=self.app.name, component=type(self).__name__ - ) + self.logger = console.load_rich_config(room=self.app.name, component=type(self).__name__) self.log(f'Connected to AD app [room]{self.app.name}[/]', level='DEBUG') await self.listen_state( diff --git a/src/room_control/model.py b/src/room_control/model.py index def1003..ef3b1fd 100644 --- a/src/room_control/model.py +++ b/src/room_control/model.py @@ -47,9 +47,7 @@ class ApplyKwargs(BaseModel): class ControllerStateConfig(BaseModel): time: Optional[str | datetime] = None elevation: Optional[float] = None - direction: Optional[Annotated[SunDirection, BeforeValidator(str_to_direction)]] = ( - None - ) + direction: Optional[Annotated[SunDirection, BeforeValidator(str_to_direction)]] = None off_duration: Optional[OffDuration] = None scene: dict[str, State] | str @@ -57,13 +55,9 @@ class ControllerStateConfig(BaseModel): def check_args(cls, values): time, elevation = values.get('time'), values.get('elevation') if time is not None and elevation is not None: - raise PydanticCustomError( - 'bad_time_spec', 'Only one of time or elevation can be set.' - ) + raise PydanticCustomError('bad_time_spec', 'Only one of time or elevation can be set.') elif elevation is not None and 'direction' not in values: - raise PydanticCustomError( - 'no_sun_dir', 'Needs sun direction with elevation' - ) + raise PydanticCustomError('no_sun_dir', 'Needs sun direction with elevation') return values def to_apply_kwargs(self, **kwargs): @@ -85,9 +79,7 @@ class RoomControllerConfig(BaseModel): if app_cfg['class'] == 'RoomController': return cls.model_validate(app_cfg) - def __rich_console__( - self, console: Console, options: ConsoleOptions - ) -> RenderResult: + def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult: table = Table( Column('Time', width=15), Column('Scene'), diff --git a/src/room_control/motion.py b/src/room_control/motion.py index 9b154b0..19bdedf 100644 --- a/src/room_control/motion.py +++ b/src/room_control/motion.py @@ -65,14 +65,11 @@ class Motion(Hass): if self.state_mismatch: self.log( - f'Sensor is {self.sensor_state} ' - f'and light is {self.ref_entity_state}', + f'Sensor is {self.sensor_state} ' f'and light is {self.ref_entity_state}', level='WARNING', ) if self.sensor_state: - self.app.activate( - kwargs={'cause': f'Syncing state with {self.sensor.entity_id}'} - ) + self.app.activate(kwargs={'cause': f'Syncing state with {self.sensor.entity_id}'}) # don't need to await these because they'll already get turned into a task by the utils.sync_wrapper decorator self.listen_state( @@ -107,9 +104,7 @@ class Motion(Hass): oneshot=True, cause='motion on', ) - self.log( - f'Waiting for sensor 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'Sensor [friendly_name]{self.sensor.friendly_name}[/] is already on', @@ -137,18 +132,14 @@ class Motion(Hass): level='WARNING', ) - def callback_light_on( - self, entity=None, attribute=None, old=None, new=None, kwargs=None - ): + def callback_light_on(self, entity=None, attribute=None, old=None, new=None, kwargs=None): """Called when the light turns on""" if new is not None: self.log(f'Detected {entity} turning on', level='DEBUG') duration = self.app.off_duration() self.listen_motion_off(duration) - def callback_light_off( - self, entity=None, attribute=None, old=None, new=None, kwargs=None - ): + def callback_light_off(self, entity=None, attribute=None, old=None, new=None, kwargs=None): """Called when the light turns off""" self.log(f'Detected {entity} turning off', level='DEBUG') self.listen_motion_on() diff --git a/src/room_control/room_control.py b/src/room_control/room_control.py index a5018b2..df14104 100755 --- a/src/room_control/room_control.py +++ b/src/room_control/room_control.py @@ -200,9 +200,7 @@ class RoomController(Hass, Mqtt): elif isinstance(scene_kwargs, dict): self.call_service('scene/apply', **scene_kwargs) - self.log( - f'Applied scene:\n{json.dumps(scene_kwargs, indent=2)}', level='DEBUG' - ) + self.log(f'Applied scene:\n{json.dumps(scene_kwargs, indent=2)}', level='DEBUG') elif scene_kwargs is None: self.log('No scene, ignoring...')