event_generator fix

apps/abstraction/transformation.py

@@ -20,6 +20,7 @@ from apps.abstraction.vendors import (
     hottis_pv_modbus,
     hottis_wago_modbus,
     hottis_wifi_relay,
+    hottis_led_stripe
 )
 
 logger = logging.getLogger(__name__)
@@ -44,6 +45,7 @@ for vendor_name, vendor_module in [
     ("hottis_pv_modbus", hottis_pv_modbus),
     ("hottis_wago_modbus", hottis_wago_modbus),
     ("hottis_wifi_relay", hottis_wifi_relay),
+    ("hottis_led_stripe", hottis_led_stripe),
 ]:
     for (device_type, direction), handler in vendor_module.HANDLERS.items():
         key = (device_type, vendor_name, direction)

apps/abstraction/vendors/hottis_led_stripe.py

@@ -0,0 +1,46 @@
+"""Hottis LED Stripe vendor transformations."""
+
+import logging
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+
+def transform_light_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract relay payload to Hottis LED Stripe format.
+    
+    Hottis LED Stripe expects plain text 'on' or 'off' (not JSON).
+    
+    Example:
+    - Abstract: {'power': 'on'}
+    - Hottis LED Stripe: 'ON'
+    """
+
+    bri = 89.0 / 254.0
+    r = int(255 * bri)
+    g = int(103 * bri)
+    b = int(25 * bri)
+
+    cmd = f"{r} {g} {b}" if payload.get("power", "off").lower() == "on" else "0 0 0"
+    return cmd
+
+
+def transform_light_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform Hottis LED Stripe relay payload to abstract format.
+    
+    Hottis LED Stripe sends plain text 'on' or 'off'.
+    
+    Example:
+    - Hottis LED Stripe: 'ON'
+    - Abstract: {'power': 'on'}
+    """
+    
+    power = "on" if payload.strip() != "0 0 0" else "off"
+    return {"power": power}
+
+
+# Registry of handlers for this vendor
+HANDLERS = {
+    ("light", "to_vendor"): transform_light_to_vendor,
+    ("light", "to_abstract"): transform_light_to_abstract,
+}

apps/api/main.py

@@ -127,14 +127,9 @@ async def redis_state_listener():
         
         logger.info("Redis state listener connected")
         
-        while True:
-            try:
-                message = await asyncio.wait_for(
-                    pubsub.get_message(ignore_subscribe_messages=True),
-                    timeout=1.0
-                )
-                
-                if message and message["type"] == "message":
+        # listen() blocks async and waits for messages - prevents busy loop
+        async for message in pubsub.listen():
+            if message["type"] == "message":
                 data = message["data"]
                 try:
                     state_data = json.loads(data)
@@ -146,9 +141,6 @@ async def redis_state_listener():
                 except Exception as e:
                     logger.warning(f"Failed to parse state data: {e}")
                 
-            except asyncio.TimeoutError:
-                pass  # No message, continue
-                
     except asyncio.CancelledError:
         logger.info("Redis state listener cancelled")
         raise
@@ -567,25 +559,31 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
             redis_client = None
             pubsub = None
         
-        # Heartbeat tracking
-        last_heartbeat = asyncio.get_event_loop().time()
         heartbeat_interval = 15  # Safari-friendly: shorter interval
         
+        # Use listen() iterator for blocking reads with heartbeat timeout
+        if pubsub:
+            listener = pubsub.listen()
+        else:
+            listener = None
+        
         while True:
             # Check if client disconnected
             if await request.is_disconnected():
                 logger.info("SSE client disconnected")
                 break
             
-            # Try to get message from Redis (if available)
-            if pubsub:
+            # Try to get message from Redis with timeout for heartbeat
+            if listener:
                 try:
+                    # Wait for message with heartbeat timeout
+                    # If no message arrives within timeout, send heartbeat
                     message = await asyncio.wait_for(
-                        pubsub.get_message(ignore_subscribe_messages=True),
-                        timeout=0.1
+                        anext(listener),
+                        timeout=heartbeat_interval
                     )
                     
-                    if message and message["type"] == "message":
+                    if message["type"] == "message":
                         data = message["data"]
                         logger.debug(f"Sending SSE message: {data[:100]}...")
                         
@@ -598,24 +596,21 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
                             logger.warning(f"Failed to parse state data for cache: {e}")
                         
                         yield f"event: message\ndata: {data}\n\n"
-                        last_heartbeat = asyncio.get_event_loop().time()
-                        continue  # Skip sleep, check for more messages immediately
                         
                 except asyncio.TimeoutError:
-                    pass  # No message, continue to heartbeat check
+                    # No message within heartbeat interval - send heartbeat
+                    yield ": ping\n\n"
+                except StopAsyncIteration:
+                    logger.warning("Redis listener stopped")
+                    break
                 except Exception as e:
                     logger.error(f"Redis error: {e}")
-                    # Continue with heartbeats even if Redis fails
-            
-            # Sleep briefly to avoid busy loop
-            await asyncio.sleep(0.1)
-            
-            # Send heartbeat if interval elapsed
-            current_time = asyncio.get_event_loop().time()
-            if current_time - last_heartbeat >= heartbeat_interval:
-                # Comment-style ping (Safari-compatible, no event type)
+                    # Continue with heartbeat-only mode
+                    listener = None
+            else:
+                # Heartbeat-only mode (no Redis)
+                await asyncio.sleep(heartbeat_interval)
                 yield ": ping\n\n"
-                last_heartbeat = current_time
             
     except asyncio.CancelledError:
         logger.info("SSE connection cancelled by client")

config/devices.yaml

@@ -1034,11 +1034,146 @@ devices:
   homekit_aid: 82
   name: Herdlicht
   type: light
-  cap_version: "relay@1.0.0"
+  cap_version: "light@1.2.0"
   technology: zigbee2mqtt
   features:
     power: true
     brightness: true
   topics:
-    state: "zigbee2mqtt/herdlicht"
-    set: "zigbee2mqtt/herdlicht/set"
+    state: "zigbee2mqtt/0x64028ffffe50e79e"
+    set: "zigbee2mqtt/0x64028ffffe50e79e/set"
+
+- device_id: regallicht_kueche  
+  homekit_aid: 83
+  name: Regallicht
+  type: light
+  cap_version: "relay@1.0.0"
+  technology: hottis_led_stripe
+  features:
+    power: true
+  topics:
+    state: "IoT/RgbLedStripeKitchen/ColorCommand"
+    set: "IoT/RgbLedStripeKitchen/ColorCommand"
+
+- device_id: regallicht_flur
+  homekit_aid: 84
+  name: Regallicht Flur
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wifi_relay
+  features:
+    power: true
+  topics:
+    set: "deconzhelper/flurregallist"
+    state: "deconzhelper/flurregallist"
+
+- device_id: steckdose_strandkorb
+  homekit_aid: 85
+  name: Steckdose Strandkorb
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/8"
+    state: "dt1/ci/8"
+- device_id: steckdose_vor_waschkueche
+  homekit_aid: 86
+  name: Steckdose vor Waschküche
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/9"
+    state: "dt1/ci/9"
+- device_id: wasser_vorne
+  homekit_aid: 87
+  name: Wasser Vorgarten
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/13"
+    state: "dt1/ci/13"
+- device_id: wasser_hinten
+  homekit_aid: 88
+  name: Wasser Garten
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/12"
+    state: "dt1/ci/12"
+- device_id: lampe_haustuer
+  homekit_aid: 89
+  name: Lampe Haustür
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/3"
+    state: "dt1/ci/3"
+- device_id: power_relay_oven
+  homekit_aid: 90
+  name: Schütz Herd
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/1"
+    state: "dt1/di/1"
+- device_id: power_relay_kitchen
+  homekit_aid: 91
+  name: Schütz Küche
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/0"
+    state: "dt1/di/0"
+- device_id: power_relay_laundry
+  homekit_aid: 92
+  name: Schütz Waschküche
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/2"
+    state: "dt1/di/2"
+- device_id: spot_garden
+  homekit_aid: 93
+  name: Spot Garten
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "dt1/coil/6"
+    state: "dt1/ci/6"
+- device_id: licht_schuppen
+  homekit_aid: 94
+  name: Licht Schuppen
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: hottis_wago_modbus
+  features:
+    power: true
+  topics:
+    set: "pulsegen/command/5/18"
+    state: "pulsegen/status/5"

config/groups.yaml

@@ -1,10 +1,13 @@
 version: 1
 groups:
   - id: "kueche_lichter"
-    name: "Küche – alle Lampen"
-    selector:
-      type: "light"
-      room: "Küche"
+    name: "Küche – alle Lampen ausser Putzlicht"
+    device_ids:
+      - kueche_deckenlampe
+      - licht_spuele_kueche
+      - herdlicht
+      - kueche_fensterbank_licht
+      - regallicht_kueche
     capabilities:
       power: true
       brightness: true
@@ -16,21 +19,25 @@ groups:
     capabilities:
       power: true
 
-  - id: "schlafzimmer_lichter"
-    name: "Schlafzimmer – alle Lampen"
-    selector:
-      type: "light"
-      room: "Schlafzimmer"
-    capabilities:
-      power: true
-      brightness: true
-
   - id: "schlafzimmer_schlummer_licht"
     name: "Schlafzimmer – Schlummerlicht"
     device_ids:
       - bettlicht_patty
       - bettlicht_wolfgang
       - medusalampe_schlafzimmer
+      - licht_kommode_schlafzimmer
+    capabilities:
+      power: true
+      brightness: true
+
+  - id: "arbeitslicht_patty"
+    name: "Patty – Arbeitslicht"
+    device_ids:
+      - schranklicht_hinten_patty
+      - schranklicht_vorne_patty
+      - leselampe_patty
+      - kugellampe_patty
+      - licht_schreibtisch_patty
     capabilities:
       power: true
       brightness: true

config/layout.yaml

@@ -148,6 +148,10 @@ rooms:
     title: Herdlicht
     icon: 💡
     rank: 145
+  - device_id: regallicht_kueche
+    title: Regallicht Küche
+    icon: 💡
+    rank: 146
   - device_id: thermostat_kueche
     title: Kueche
     icon: 🌡️
@@ -261,6 +265,14 @@ rooms:
     title: Schranklicht vor Küche
     icon: 💡
     rank: 232  
+  - device_id: regallicht_flur
+    title: Regallicht Flur
+    icon: 💡
+    rank: 233
+  - device_id: lampe_haustuer
+    title: Lampe Haustür
+    icon: 💡
+    rank: 234
   - device_id: sensor_flur
     title: Temperatur & Luftfeuchte
     icon: 🌡️
@@ -341,6 +353,30 @@ rooms:
     title: Gartenlicht vorne
     icon: 💡
     rank: 291
+  - device_id: spot_garden
+    title: Spot Garten
+    icon: 💡
+    rank: 292
+  - device_id: licht_schuppen
+    title: Licht Schuppen
+    icon: 💡
+    rank: 293
+  - device_id: steckdose_strandkorb 
+    title: Steckdose Strandkorb
+    icon: 🔌
+    rank: 294
+  - device_id: steckdose_vor_waschkueche 
+    title: Steckdose vor Waschküche
+    icon: 🔌
+    rank: 295
+  - device_id: wasser_vorne 
+    title: Wasser Vorgarten
+    icon: 💧
+    rank: 296
+  - device_id: wasser_hinten
+    title: Wasser Garten
+    icon: 💧
+    rank: 297
 - id: garage
   name: Garage
   devices:
@@ -367,6 +403,21 @@ rooms:
     title: Werkstatt Licht
     icon: 💡
     rank: 350   
+- id: devices
+  name: Devices
+  devices:
+  - device_id: power_relay_oven
+    title: Schütz Herd
+    icon: ⚡
+    rank: 400
+  - device_id: power_relay_kitchen
+    title: Schütz Küche
+    icon: ⚡
+    rank: 405
+  - device_id: power_relay_laundry
+    title: Schütz Waschküche
+    icon: ⚡
+    rank: 410
 
 
 

config/rules.yaml

@@ -1,9 +1,19 @@
-# Rules Configuration
-# Auto-generated from devices.yaml
-
 rules:
+- id: window_setback_bad_unten
+  enabled: true
+  name: Fensterabsenkung Bad Unten
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_bad_unten_strasse
+    thermostats:
+    - thermostat_bad_unten
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
 - id: window_setback_esszimmer
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Esszimmer
   type: window_setback@1.0
   objects:
@@ -17,8 +27,23 @@ rules:
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
+- id: window_setback_wohnzimmer
+  enabled: true
+  name: Fensterabsenkung Wohnzimmer
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_wohnzimmer_garten_links
+    - kontakt_wohnzimmer_garten_rechts
+    thermostats:
+    - thermostat_wohnzimmer
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20
+    previous_target_ttl_secs: 86400
 - id: window_setback_kueche
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Küche
   type: window_setback@1.0
   objects:
@@ -35,7 +60,7 @@ rules:
     close_min_secs: 20
     previous_target_ttl_secs: 86400
 - id: window_setback_patty
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Arbeitszimmer Patty
   type: window_setback@1.0
   objects:
@@ -51,7 +76,7 @@ rules:
     close_min_secs: 20
     previous_target_ttl_secs: 86400
 - id: window_setback_schlafzimmer
-  enabled: false
+  enabled: true
   name: Fensterabsenkung Schlafzimmer
   type: window_setback@1.0
   objects:
@@ -64,21 +89,6 @@ rules:
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
-- id: window_setback_wohnzimmer
-  enabled: false
-  name: Fensterabsenkung Wohnzimmer
-  type: window_setback@1.0
-  objects:
-    contacts:
-    - kontakt_wohnzimmer_garten_links
-    - kontakt_wohnzimmer_garten_rechts
-    thermostats:
-    - thermostat_wohnzimmer
-  params:
-    eco_target: 16.0
-    open_min_secs: 20
-    close_min_secs: 20
-    previous_target_ttl_secs: 86400
 - id: window_setback_wolfgang
   enabled: true
   name: Fensterabsenkung Arbeitszimmer Wolfgang
@@ -92,3 +102,16 @@ rules:
     eco_target: 16.0
     open_min_secs: 20
     close_min_secs: 20
+- id: window_setback_bad_oben
+  enabled: true
+  name: Fensterabsenkung Bad Oben
+  type: window_setback@1.0
+  objects:
+    contacts:
+    - kontakt_bad_oben_strasse
+    thermostats:
+    - thermostat_bad_oben
+  params:
+    eco_target: 16.0
+    open_min_secs: 20
+    close_min_secs: 20