fix window setback logic for multiple windows

apps/rules/impl/window_setback.py

@@ -18,6 +18,19 @@ 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):
     """
     Window setback automation rule.
@@ -31,16 +44,14 @@ class WindowSetbackRule(Rule):
             thermostats: List of thermostat device IDs to control (required, min 1)
         params:
             eco_target: Temperature to set when window opens (default: 16.0)
-            open_min_secs: Minimum seconds window must be open before triggering (default: 20)
-            close_min_secs: Minimum seconds window must be closed before restoring (default: 20)
             previous_target_ttl_secs: How long to remember previous temperature (default: 86400)
     
     State storage (Redis keys):
-        rule:{rule_id}:contact:{device_id}:state -> "open" | "closed"
-        rule:{rule_id}:contact:{device_id}:ts -> ISO timestamp of last change
         rule:{rule_id}:thermo:{device_id}:current_target -> Current target temp (updated on every STATE)
         rule:{rule_id}:thermo:{device_id}:previous -> Previous target temp (saved on window open, deleted on restore)
-    
+        rule:{rule_id}:contact:{device_id}:is_open -> "1" if open, "0" if closed    
+        rule:{rule_id}:state -> Overall rule state -> "1" if thermostats set to eco, "0" otherwise
+            
     Logic:
         1. Thermostat STATE events → update current_target in Redis
         2. Window opens → copy current_target to previous, then set to eco_target
@@ -129,18 +140,30 @@ class WindowSetbackRule(Rule):
         if not contact_state:
             ctx.logger.warning(f"Contact event missing 'contact' field: {evt}")
             return
-        
-        # Store current state and timestamp
-        state_key = f"rule:{desc.id}:contact:{device_id}:state"
-        ts_key = f"rule:{desc.id}:contact:{device_id}:ts"
-        
-        await ctx.redis.set(state_key, contact_state)
-        await ctx.redis.set(ts_key, event_ts)
-        
-        if contact_state == 'open':
-            await self._on_window_opened(desc, ctx)
-        elif contact_state == 'closed':
-            await self._on_window_closed(desc, ctx)
+                
+        contact_state_key = __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_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)
+        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
+            await self._set_eco_mode(desc, ctx)
+            await ctx.redis.set(rule_state_key, '1')
+        elif not is_open and current_rule_state != '0':
+            # All contacts are closed, and we are currently in eco mode
+            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:
         """
@@ -160,12 +183,12 @@ class WindowSetbackRule(Rule):
         
         # FIRST: Save current target temperatures as "previous" (before we change them!)
         for thermo_id in target_thermostats:
-            current_key = f"rule:{desc.id}:thermo:{thermo_id}:current_target"
+            current_key = __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 = f"rule:{desc.id}:thermo:{thermo_id}:previous"
+                prev_key = __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"
@@ -199,7 +222,7 @@ class WindowSetbackRule(Rule):
         
         # Restore previous temperatures
         for thermo_id in target_thermostats:
-            prev_key = f"rule:{desc.id}:thermo:{thermo_id}:previous"
+            prev_key = __get_redis_key_previous_target(desc.id, thermo_id)
             prev_temp_str = await ctx.redis.get(prev_key)
             
             if prev_temp_str:
@@ -240,7 +263,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 = f"rule:{desc.id}:thermo:{device_id}:current_target"
+        current_key = __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)

config/devices.yaml

@@ -1152,3 +1152,38 @@ devices:
   topics:
     state: "zigbee2mqtt/0x842e14fffefe4ba4"
     set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
+
+- device_id: kontakt_test_1
+  homekit_aid: 97
+  name: Kontakt Test 1
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: test
+  topics:
+    state: test/kontakt1/state
+  features: {}
+- device_id: kontakt_test_2
+  homekit_aid: 98
+  name: Kontakt Test 2
+  type: contact
+  cap_version: contact_sensor@1.0.0
+  technology: test
+  topics:
+    state: test/kontakt2/state
+  features: {}
+- device_id: thermostat_test
+  homekit_aid: 99
+  name: Thermostat Test
+  type: thermostat
+  cap_version: "thermostat@1.0.0"
+  technology: test
+  features:
+    heating: true
+    temperature_range:
+    - 5
+    - 30
+    temperature_step: 0.5
+  topics:
+    state: "test/thermostat1/state"
+    set: "test/thermostat1/set"
+  

config/rules.yaml

@@ -9,11 +9,7 @@ rules:
     thermostats:
     - thermostat_bad_unten
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_esszimmer
@@ -27,11 +23,7 @@ rules:
     thermostats:
     - thermostat_esszimmer
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -46,11 +38,7 @@ rules:
     thermostats:
     - thermostat_wohnzimmer
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -67,11 +55,7 @@ rules:
     thermostats:
     - thermostat_kueche
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -87,11 +71,7 @@ rules:
     thermostats:
     - thermostat_patty
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -105,11 +85,7 @@ rules:
     thermostats:
     - thermostat_schlafzimmer
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -123,11 +99,7 @@ rules:
     thermostats:
     - thermostat_wolfgang
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_bad_oben
@@ -140,10 +112,20 @@ rules:
     thermostats:
     - thermostat_bad_oben
   params:
-<<<<<<< HEAD
-    eco_target: 6.0
-=======
     eco_target: 5.0
->>>>>>> main
+    open_min_secs: 20
+    close_min_secs: 20
+- id: window_setback_test
+  enabled: true
+  name: Fensterabsenkung Test
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_test_1
+    - kontakt_test_2
+    thermostats:
+    - thermostat_test
+  params:
+    eco_target: 7.0
     open_min_secs: 20
     close_min_secs: 20