diff --git a/apps/rules/impl/window_setback.py b/apps/rules/impl/window_setback.py index 83ef87a..6532c5e 100644 --- a/apps/rules/impl/window_setback.py +++ b/apps/rules/impl/window_setback.py @@ -18,18 +18,6 @@ class WindowSetbackObjects(BaseModel): thermostats: list[str] = Field(..., min_length=1, description="Thermostats to control") -def __get_redis_key_current_target(rule_id: str, thermo_id: str) -> str: - """Get Redis key for current target temperature of a thermostat""" - return f"rule:{rule_id}:thermo:{thermo_id}:current_target" -def __get_redis_key_previous_target(rule_id: str, thermo_id: str) -> str: - """Get Redis key for previous target temperature of a thermostat""" - return f"rule:{rule_id}:thermo:{thermo_id}:previous" -def __get_redis_key_contact_state(rule_id: str, contact_id: str) -> str: - """Get Redis key for contact sensor state""" - return f"rule:{rule_id}:contact:{contact_id}:is_open" -def __get_redis_key_rule_state(rule_id: str) -> str: - """Get Redis key for overall rule state""" - return f"rule:{rule_id}:state" class WindowSetbackRule(Rule): """ @@ -57,7 +45,24 @@ class WindowSetbackRule(Rule): 2. Window opens → copy current_target to previous, then set to eco_target 3. Window closes → restore from previous, then delete previous key """ - + + @staticmethod + def __get_redis_key_current_target(rule_id: str, thermo_id: str) -> str: + """Get Redis key for current target temperature of a thermostat""" + return f"rule:{rule_id}:thermo:{thermo_id}:current_target" + @staticmethod + def __get_redis_key_previous_target(rule_id: str, thermo_id: str) -> str: + """Get Redis key for previous target temperature of a thermostat""" + return f"rule:{rule_id}:thermo:{thermo_id}:previous" + @staticmethod + def __get_redis_key_contact_state(rule_id: str, contact_id: str) -> str: + """Get Redis key for contact sensor state""" + return f"rule:{rule_id}:contact:{contact_id}:is_open" + @staticmethod + def __get_redis_key_rule_state(rule_id: str) -> str: + """Get Redis key for overall rule state""" + return f"rule:{rule_id}:state" + def __init__(self): super().__init__() self._validated_objects: dict[str, WindowSetbackObjects] = {} @@ -141,19 +146,19 @@ class WindowSetbackRule(Rule): ctx.logger.warning(f"Contact event missing 'contact' field: {evt}") return - contact_state_key = __get_redis_key_contact_state(desc.id, device_id) + contact_state_key = WindowSetbackRule.__get_redis_key_contact_state(desc.id, device_id) await ctx.redis.set(contact_state_key, '1' if contact_state == 'open' else '0') # Check if any contact is open is_open = False for contact_id in desc.objects.get('contacts', []): - state_key = __get_redis_key_contact_state(desc.id, contact_id) + state_key = WindowSetbackRule.__get_redis_key_contact_state(desc.id, contact_id) state_val = await ctx.redis.get(state_key) if state_val == '1': is_open = True break - rule_state_key = __get_redis_key_rule_state(desc.id) + rule_state_key = WindowSetbackRule.__get_redis_key_rule_state(desc.id) current_rule_state = await ctx.redis.get(rule_state_key) if is_open and current_rule_state != '1': # At least one contact is open, and we are not already in eco mode @@ -164,31 +169,26 @@ class WindowSetbackRule(Rule): await self._unset_eco_mode(desc, ctx) await ctx.redis.set(rule_state_key, '0') - - async def _on_window_opened(self, desc: RuleDescriptor, ctx: RuleContext) -> None: - """ - Window opened - save current temperatures, then set thermostats to eco. - - Important: We must save the current target BEFORE setting to eco, - otherwise we'll save the eco temperature instead of the original. - """ - eco_target = desc.params.get('eco_target', 16.0) + + async def _set_eco_mode(self, desc: RuleDescriptor, ctx: RuleContext) -> None: + """Set thermostats to eco temperature when window opens.""" + eco_target = desc.params.get('eco_target', 7.0) target_thermostats = desc.objects.get('thermostats', []) ttl_secs = desc.params.get('previous_target_ttl_secs', 86400) ctx.logger.info( - f"Rule {desc.id}: Window opened, setting {len(target_thermostats)} " + f"Rule {desc.id}: At least one window is opened, setting {len(target_thermostats)} " f"thermostats to eco temperature {eco_target}°C" ) # FIRST: Save current target temperatures as "previous" (before we change them!) for thermo_id in target_thermostats: - current_key = __get_redis_key_current_target(desc.id, thermo_id) + current_key = WindowSetbackRule.__get_redis_key_current_target(desc.id, thermo_id) current_temp_str = await ctx.redis.get(current_key) if current_temp_str: # Save current as previous (with TTL) - prev_key = __get_redis_key_previous_target(desc.id, thermo_id) + prev_key = WindowSetbackRule.__get_redis_key_previous_target(desc.id, thermo_id) await ctx.redis.set(prev_key, current_temp_str, ttl_secs=ttl_secs) ctx.logger.debug( f"Saved previous target for {thermo_id}: {current_temp_str}°C" @@ -205,24 +205,20 @@ class WindowSetbackRule(Rule): ctx.logger.debug(f"Set {thermo_id} to {eco_target}°C") except Exception as e: ctx.logger.error(f"Failed to set {thermo_id}: {e}") - - async def _on_window_closed(self, desc: RuleDescriptor, ctx: RuleContext) -> None: - """ - Window closed - restore previous temperatures. - - Note: This is simplified. A production implementation would check - close_min_secs and use a timer/scheduler. - """ + + + async def _unset_eco_mode(self, desc: RuleDescriptor, ctx: RuleContext) -> None: + """Restore thermostats to previous temperature when window closes.""" target_thermostats = desc.objects.get('thermostats', []) ctx.logger.info( - f"Rule {desc.id}: Window closed, restoring {len(target_thermostats)} " + f"Rule {desc.id}: All windows closed, restoring {len(target_thermostats)} " f"thermostats to previous temperatures" ) # Restore previous temperatures for thermo_id in target_thermostats: - prev_key = __get_redis_key_previous_target(desc.id, thermo_id) + prev_key = WindowSetbackRule.__get_redis_key_previous_target(desc.id, thermo_id) prev_temp_str = await ctx.redis.get(prev_key) if prev_temp_str: @@ -263,7 +259,7 @@ class WindowSetbackRule(Rule): return # No target in this state update # Store current target (always update, even if it's the eco temperature) - current_key = __get_redis_key_current_target(desc.id, device_id) + current_key = WindowSetbackRule.__get_redis_key_current_target(desc.id, device_id) ttl_secs = desc.params.get('previous_target_ttl_secs', 86400) await ctx.redis.set(current_key, str(current_target), ttl_secs=ttl_secs)