From 868a5d7e4faf46bf8b74916b1c10a2d7caa33353 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Sun, 1 Nov 2026 13:10:54 +0200 Subject: [PATCH] Refactor bedroom presence controller to parallel arrows style --- src/HomeAssistant/Controller/Bedroom.hs | 83 +++++++++++++------------ 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/src/HomeAssistant/Controller/Bedroom.hs b/src/HomeAssistant/Controller/Bedroom.hs index 55f7ed0..4607482 100644 --- a/src/HomeAssistant/Controller/Bedroom.hs +++ b/src/HomeAssistant/Controller/Bedroom.hs @@ -1,21 +1,18 @@ {-# LANGUAGE Arrows #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE DerivingVia #-} module HomeAssistant.Controller.Bedroom where import HomeAssistant.Controller import qualified Data.Text as T -import AFRP (Event (..), lMerge, duration, edge, filterEvent, named, (>>||)) +import AFRP (Event (..), edge, filterEvent, hold, named, snapshot, tag, waitFor, (>>||)) import Data.Aeson (Value, object, (.=)) import Control.Arrow ((>>>), returnA, arr, Arrow (..)) import Data.Bool (bool) -import Data.Time (NominalDiffTime) import qualified AFRP import Data.Map (Map) import qualified Data.Map.Strict as M import Data.Serialize.Text () import Data.Default (def) -import Data.Serialize (Serialize) @@ -37,47 +34,56 @@ createBedroomScene = Service bedroomPresence :: HASS (Event Value) (Event Presence) bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy" -presenceLightEvents :: HASS (Event Value) (Event LightingMode) -presenceLightEvents = - bedroomPresence >>> AFRP.hold Unoccupied - >>> arr lightWanted - >>> (sleepEvent &&& offEvent &&& onEvent) - >>> arr (\(s,(o,n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n) - where - lightWanted o = o == Occupied - sleepEvent = arr not >>> AFRP.edge >>> arr (AFRP.tag LightingSleep) - onEvent = AFRP.edge >>> arr (AFRP.tag LightingOn) - offEvent = arr not >>> AFRP.waitFor 300 >>> arr (AFRP.tag LightingOff) - +bedroomPresenceOccupied :: HASS (Event Value) Bool +bedroomPresenceOccupied = bedroomPresence >>> hold Unoccupied >>> arr (== Occupied) bedroomLightStatus :: HASS (Event Value) (Map T.Text LightObservation) bedroomLightStatus = M.fromList <$> traverse (\e -> (e,) <$> observedLight e) [e | EntityId e <- bedroomLightTargets] -newtype Snapshot = Snapshot { getSnapshot :: Map T.Text LightObservation } - deriving (Show, Eq) - deriving Serialize via (Map T.Text LightObservation) - lightLevel :: HASS (Event Value) Int lightLevel = entityRead "sensor.presence_sensor_bedroom_light_level" >>> AFRP.hold 1 +-- Snapshot the light status when leaving (presence turning unoccupied), +-- restored on the next entry. +snapshotOnLeaving :: HASS (Event Value) (Map T.Text LightObservation) +snapshotOnLeaving = + (bedroomPresenceOccupied &&& bedroomLightStatus) + >>> first (arr not >>> edge) + >>> snapshot M.empty + +-- The light reactions run "in parallel"; there is a chance that two +-- services are called in one go bedroomPresenceController :: HASS (Event Value) () -bedroomPresenceController = proc x -> do - p <- presenceLightEvents >>> traceEvent -< x - capped <- lightLevel >>> arr (< 4) -< x - st <- bedroomLightStatus -< x - snap <- first doSnapshot >>> AFRP.snapshot M.empty >>> arr Snapshot -< (x,st) - -- This line is just for debugging - _ <- AFRP.changes >>> traceEvent -< snap - case p of - Event LightingOff -> do - callService "Turn off lights" (light bedroomLightTargets Off) -< () - Event LightingOn -> do - callServicesDyn "Turn on lights (capped)" (\(c,xs) -> concatMap (uncurry (toLight c)) xs) -< (capped, M.toList (getSnapshot snap)) - returnA -< () - Event LightingSleep | anyLightsAreOn st -> do - callService "Turn on sleep" (activateScene "scene.makuuhuone_lepotila") -< () - _ -> returnA -< () +bedroomPresenceController = + ((,,,) <$> bedroomPresenceOccupied <*> cappedLightLevel <*> bedroomLightStatus <*> snapshotOnLeaving) + >>> mconcat + [ AFRP.named "Lights on" lightsOn + , AFRP.named "Lights sleep" lightsSleep + , AFRP.named "Lights off" lightsOff + ] + >>> arr (const ()) -- I don't like this extra arr here where + cappedLightLevel :: HASS (Event Value) Bool + cappedLightLevel = lightLevel >>> arr (< 4) + + lightsOn = + arr (\(o, capped, _, snap) -> (o, (capped, M.toList snap))) + >>> first edge + >>> arr (\(ev, p) -> tag p ev) + >>|| callServicesDyn "Turn on lights (capped)" (\(c,xs) -> concatMap (uncurry (toLight c)) xs) + + lightsSleep = + arr (\(o, _, st, _) -> (not o, st)) + >>> first edge + >>> arr (\(ev, st) -> tag st ev) + >>> filterEvent anyLightsAreOn + >>|| callService "Turn on sleep" (activateScene "scene.makuuhuone_lepotila") + + lightsOff = + arr (\(o, _, _, _) -> not o) + >>> waitFor 300 + >>|| callService "Turn off lights" (light bedroomLightTargets Off) + anyLightsAreOn :: Foldable f => f LightObservation -> Bool anyLightsAreOn = any observedOn toLight :: Bool -> T.Text -> LightObservation -> [Service] @@ -88,8 +94,6 @@ bedroomPresenceController = proc x -> do , lightColorTemperature = t }) ] - doSnapshot = presenceLightEvents - >>> arr (\ev -> if ev == Event LightingSleep then Event () else Tick) data BedroomControls @@ -152,9 +156,6 @@ door :: HASS (Event Value) (Event DoorState) door = entityBool "binary_sensor.makuuhuone_ovi_contact" >>> arr (fmap (bool Closed Open)) -waitFor :: NominalDiffTime -> HASS a (Event ()) -waitFor n = duration >>> arr (> n) >>> edge - delayedDoor :: HASS (Event Value) (Event DoorState) delayedDoor = door